diff options
author | Jon Bratseth <jonbratseth@yahoo.com> | 2017-04-26 18:03:48 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-26 18:03:48 +0200 |
commit | 6e91e608084ae5378a3770a3ae422aa17144fecc (patch) | |
tree | 8a5a0bc3edc32aa1a2c52783fb0c944fd3c0c65f /container-disc/src/main/java/com/yahoo/container/jdisc/component/Deconstructor.java | |
parent | 20f7237fe3eb3aa98e4b051184ba964ff35c97fc (diff) | |
parent | deb7600ab0855e3557a69d7466ecf733be21b961 (diff) |
Merge pull request #2300 from yahoo/revert-2294-revert-2293-revert-2286-gjoranv/catch-exception-in-deconstruct
Revert "Revert "Revert "Catch exception thrown from AbstractComponent.deconstruct."""
Diffstat (limited to 'container-disc/src/main/java/com/yahoo/container/jdisc/component/Deconstructor.java')
-rw-r--r-- | container-disc/src/main/java/com/yahoo/container/jdisc/component/Deconstructor.java | 18 |
1 files changed, 2 insertions, 16 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 1fd08e2be7b..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 @@ -7,14 +7,11 @@ import com.yahoo.container.di.ComponentDeconstructor; import com.yahoo.container.di.componentgraph.Provider; import com.yahoo.jdisc.SharedResource; -import java.util.Random; import java.util.concurrent.Executors; 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 @@ -57,19 +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 (Error e) { - try { - Thread.sleep((long) (new Random(System.nanoTime()).nextDouble() * 180 * 1000)); - } catch (InterruptedException e) { } - 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); - } + component.deconstruct(); + log.info("Finished deconstructing " + component); } } } |