diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-04-26 15:44:34 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-26 15:44:34 +0200 |
commit | 61de97d75314ae34f20c6fade4c1f3bfa51adf27 (patch) | |
tree | 7ff92a02ddd33f386b4358ccd04a3a03da9c3e73 /container-disc/src/main/java/com/yahoo | |
parent | 4d1ea426e7b62545907db35e56e8fa04cdd10885 (diff) |
Revert "Catch exception thrown from AbstractComponent.deconstruct."
Diffstat (limited to 'container-disc/src/main/java/com/yahoo')
-rw-r--r-- | container-disc/src/main/java/com/yahoo/container/jdisc/component/Deconstructor.java | 13 |
1 files changed, 2 insertions, 11 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 ae7599add4c..6a2e33db309 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,8 +12,6 @@ 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 @@ -56,15 +54,8 @@ public class Deconstructor implements ComponentDeconstructor { public void run() { log.info("Starting deconstruction of " + 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); - } + component.deconstruct(); + log.info("Finished deconstructing " + component); } - } } |