Ensure ExperimentUtil.scheduleShutdownActiveExperiment invokes callback

This needs to be done because calling parties may rely on getting the
callback.

refs #7220

Change-Id: Ie81c20da8da9d734afe7f98cf1117176b2f2dc9d
(cherry picked from commit 51239a7b24d812eec59b7f635ed0cfd9d116a268)

diff --git a/bundles/org.simantics.db.common/src/org/simantics/db/common/service/ServiceActivityMonitorImpl.java b/bundles/org.simantics.db.common/src/org/simantics/db/common/service/ServiceActivityMonitorImpl.java
index 1858e87ddea8af1249af7343f95cb1a2037548ae..541380dc59e250567a0ad647e5829c2e9d7fdf13 100644 (file)
--- a/bundles/org.simantics.db.common/src/org/simantics/db/common/service/ServiceActivityMonitorImpl.java
+++ b/bundles/org.simantics.db.common/src/org/simantics/db/common/service/ServiceActivityMonitorImpl.java
@@ -5,12 +5,16 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.simantics.db.service.ServiceActivityMonitor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import gnu.trove.map.TObjectIntMap;
 import gnu.trove.map.hash.TObjectIntHashMap;
 
 public class ServiceActivityMonitorImpl implements ServiceActivityMonitor {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(ServiceActivityMonitorImpl.class);
+
     public static final long REPORTING_PERIOD = 5L;
     
     Semaphore sem = new Semaphore(1);
@@ -46,8 +50,8 @@ public class ServiceActivityMonitorImpl implements ServiceActivityMonitor {
             if(waitForCompletion(REPORTING_PERIOD, TimeUnit.SECONDS))
                 return;
             synchronized (ids) {
-                System.err.println("ServiceActivityMonitorImpl.waitForCompletion: " + ids);
-            }    
+                LOGGER.info("waitForCompletion: " + ids);
+            }
         }
     }
 

diff --git a/bundles/org.simantics.simulation/src/org/simantics/simulation/experiment/ExperimentUtil.java b/bundles/org.simantics.simulation/src/org/simantics/simulation/experiment/ExperimentUtil.java
index a819ef8ed915462da196d5e120ceee3a6a070021..ecf7f0a9ae82ee8d42cce99e67c996dbab2ed446 100644 (file)
--- a/bundles/org.simantics.simulation/src/org/simantics/simulation/experiment/ExperimentUtil.java
+++ b/bundles/org.simantics.simulation/src/org/simantics/simulation/experiment/ExperimentUtil.java
@@ -136,17 +136,19 @@ public final class ExperimentUtil {
                 protected IStatus run(final IProgressMonitor monitor) {
                     try {
                         experiment.shutdown(monitor);
-                        if (callback != null)
-                            callback.accept(null);
                         return Status.OK_STATUS;
                     } finally {
                         monitor.done();
+                        if (callback != null)
+                            callback.accept(null);
                     }
                 }
             };
             job.setProperty(IProgressConstants2.SHOW_IN_TASKBAR_ICON_PROPERTY, Boolean.TRUE);
             job.setUser(true);
             job.schedule();
+        } else {
+            callback.accept(null);
         }
     }