X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=bundles%2Forg.simantics.workbench%2Fsrc%2Forg%2Fsimantics%2Fworkbench%2Finternal%2FSimanticsWorkbenchAdvisor.java;h=39b797ba4ccbb7c108970a2b5e4b8705274804da;hb=df9d54067bc99d1ead12b7d369be0d467d574837;hp=0bce2a5680cc57cc0af696be3faf7953cd1bb0db;hpb=bcbe7aa23f42b82ff6fe4304943193c04858096c;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.workbench/src/org/simantics/workbench/internal/SimanticsWorkbenchAdvisor.java b/bundles/org.simantics.workbench/src/org/simantics/workbench/internal/SimanticsWorkbenchAdvisor.java
index 0bce2a568..39b797ba4 100644
--- a/bundles/org.simantics.workbench/src/org/simantics/workbench/internal/SimanticsWorkbenchAdvisor.java
+++ b/bundles/org.simantics.workbench/src/org/simantics/workbench/internal/SimanticsWorkbenchAdvisor.java
@@ -105,6 +105,7 @@ import org.simantics.ui.jobs.SessionGarbageCollectorJob;
 import org.simantics.ui.workbench.PerspectiveBarsActivator;
 import org.simantics.ui.workbench.PerspectiveContextActivator;
 import org.simantics.utils.logging.TimeLogger;
+import org.simantics.utils.threads.ExecutorWorker;
 import org.simantics.utils.threads.ThreadUtils;
 import org.simantics.utils.ui.dialogs.ShowError;
 import org.simantics.utils.ui.dialogs.ShowMessage;
@@ -358,7 +359,7 @@ public class SimanticsWorkbenchAdvisor extends WorkbenchAdvisor {
         try {
             platformShutdownRunnable.run(null);
         } catch (InvocationTargetException e) {
-            Activator.logError(getClass().getSimpleName() + ".openWindows failed", e);
+            Activator.logError(getClass().getSimpleName() + ".openWindows failed", e.getCause());
         } catch (InterruptedException e) {
             Activator.logError(getClass().getSimpleName() + ".openWindows failed", e);
         }
@@ -754,6 +755,7 @@ public class SimanticsWorkbenchAdvisor extends WorkbenchAdvisor {
 
                 progress.subTask("Thread pools");
                 ThreadUtils.shutdown();
+                ExecutorWorker.shutdown();
                 progress.worked(5);
 
                 progress.subTask("Clear index status");