From b6433667f3d1c881bc1a1cbc5bc46cecbddd3671 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Thu, 1 Mar 2018 09:42:14 +0100 Subject: Don't die on NoClassDefFoundError --- .../com/yahoo/container/jdisc/component/Deconstructor.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'container-disc') diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/component/Deconstructor.java b/container-disc/src/main/java/com/yahoo/container/jdisc/component/Deconstructor.java index a986fbc794b..8dc3a81db12 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/component/Deconstructor.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/component/Deconstructor.java @@ -63,15 +63,15 @@ public class Deconstructor implements ComponentDeconstructor { try { component.deconstruct(); log.info("Finished deconstructing " + component); - } catch (Error e) { + } + catch (Exception | NoClassDefFoundError e) { // May get class not found due to it being already unloaded + log.log(WARNING, "Exception thrown when deconstructing " + component, e); + } + catch (Error e) { try { Thread.sleep((long) (new Random(System.nanoTime()).nextDouble() * 180 * 1000)); } catch (InterruptedException exception) { } com.yahoo.protect.Process.logAndDie("Error when deconstructing " + component, e); - } catch (Exception e) { - log.log(WARNING, "Exception thrown when deconstructing " + component, e); - } catch (Throwable t) { - log.log(WARNING, "Unexpected Throwable thrown when deconstructing " + component, t); } } } -- cgit v1.2.3