Catch exception thrown from AbstractComponent.deconstruct.

- Log nested error messages.

1 files changed, 8 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..9830b226c2b 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
@@ -6,6 +6,7 @@ import com.yahoo.concurrent.ThreadFactoryFactory;
 import com.yahoo.container.di.ComponentDeconstructor;
 import com.yahoo.container.di.componentgraph.Provider;
 import com.yahoo.jdisc.SharedResource;
+import com.yahoo.yolean.Exceptions;
 
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -54,8 +55,13 @@ 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.warning("Exception thrown when deconstructing " + component + ": " + e.getClass().getName()
+                                    + ": " + Exceptions.toMessageString(e));
+            }
         }
     }
 }