Fixed race condition in DynamicExperimentThread.

[simantics/platform.git] / bundles / org.simantics.simulator.toolkit / src / org / simantics / simulator / toolkit / DynamicExperimentThread.java

diff --git a/bundles/org.simantics.simulator.toolkit/src/org/simantics/simulator/toolkit/DynamicExperimentThread.java b/bundles/org.simantics.simulator.toolkit/src/org/simantics/simulator/toolkit/DynamicExperimentThread.java
index 66cec38a46b62664c0a5037af4d24060378730b2..0967bfdbc28d19c3e5b69eae0980128fa296ad92 100644 (file)
--- a/bundles/org.simantics.simulator.toolkit/src/org/simantics/simulator/toolkit/DynamicExperimentThread.java
+++ b/bundles/org.simantics.simulator.toolkit/src/org/simantics/simulator/toolkit/DynamicExperimentThread.java
@@ -125,7 +125,7 @@ abstract public class DynamicExperimentThread extends Thread {
                                runTasks();
                                taskTime += System.nanoTime() - asd2;
 
-                               System.err.println(" st = " + 1e-9*stepTime + " tt = " + 1e-9*taskTime);
+                               //System.err.println(" st = " + 1e-9*stepTime + " tt = " + 1e-9*taskTime);
 
                                while(obtainedRealtimeRatio > desiredRealtimeRatio) {
                                        int ran = runTasks();
@@ -151,9 +151,8 @@ abstract public class DynamicExperimentThread extends Thread {
 
                        } else {
 
-                               while(!inState(StandardExperimentStates.Running.class) && inActiveState()) {
-
-                                       synchronized(tasks) {
+                               synchronized(tasks) {
+                                       while(!inState(StandardExperimentStates.Running.class) && inActiveState()) {
                                                int ran = runTasks();
                                                if(ran == 0) {
                                                        try {