diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-04-26 15:34:09 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-26 15:34:09 +0200 |
commit | 4d1ea426e7b62545907db35e56e8fa04cdd10885 (patch) | |
tree | 9537c7ad0e9735562cb8ef8795a8edcee7246c2e /container-disc | |
parent | b4f8bc923e54ec98ca51fb88d63f8aa1e3b455b2 (diff) | |
parent | 1ed0cc0e21c8871e2075e1ab6720efa633c219fb (diff) |
Merge pull request #2286 from yahoo/gjoranv/catch-exception-in-deconstruct
Catch exception thrown from AbstractComponent.deconstruct.
Diffstat (limited to 'container-disc')
-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); + } } + } } |