diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-04-26 15:45:56 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-26 15:45:56 +0200 |
commit | ca4d844eddcbcfa7ef3b6515a315c33a4e2c11c7 (patch) | |
tree | 9537c7ad0e9735562cb8ef8795a8edcee7246c2e /container-disc/src/main/java/com/yahoo/container/jdisc/component | |
parent | 2a3440e6ee544569c8fae7a03fa70195f0963477 (diff) |
Revert "Revert "Catch exception thrown from AbstractComponent.deconstruct.""
Diffstat (limited to 'container-disc/src/main/java/com/yahoo/container/jdisc/component')
-rw-r--r-- | container-disc/src/main/java/com/yahoo/container/jdisc/component/Deconstructor.java | 13 |
1 files changed, 11 insertions, 2 deletions
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 6a2e33db309..ae7599add4c 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 @@ -12,6 +12,8 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.logging.Logger; +import static java.util.logging.Level.WARNING; + /** * @author tonyv * @author gv @@ -54,8 +56,15 @@ public class Deconstructor implements ComponentDeconstructor { public void run() { log.info("Starting deconstruction of " + component); - component.deconstruct(); - log.info("Finished deconstructing " + component); + try { + component.deconstruct(); + log.info("Finished deconstructing " + component); + } catch (Exception e) { + log.log(WARNING, "Exception thrown when deconstructing " + component, e); + } catch (Throwable t) { + com.yahoo.protect.Process.logAndDie("Error when deconstructing " + component, t); + } } + } } |