Merge pull request #15 from scaleoutsoftware/br-dev-workbenchfix

Address init context inconsistency
scaleoutsoftware · Jan 30, 2024 · c2b65a3 · c2b65a3
2 parents 4fefa0b + c5aea00
commit c2b65a3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/Development/build.gradle b/Development/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 group 'com.scaleoutsoftware.digitaltwin'
-version '3.0.5'
+version '3.0.6'
 
 sourceCompatibility = JavaVersion.VERSION_12
 

diff --git a/...pment/src/main/java/com/scaleoutsoftware/digitaltwin/development/TwinExecutionEngine.java b/...pment/src/main/java/com/scaleoutsoftware/digitaltwin/development/TwinExecutionEngine.java
@@ -52,7 +52,7 @@ void init(   ) {
         _simulationProcessors           = new ConcurrentHashMap<>();
         _messageProcessorValueTypes     = new ConcurrentHashMap<>();
         _modelInstances                 = new ConcurrentHashMap<>();
-        _alertProviders = new ConcurrentHashMap<>();
+        _alertProviders                 = new ConcurrentHashMap<>();
         _simulationSchedulers           = new ConcurrentHashMap<>();
         _realTimeTimers                 = new ConcurrentHashMap<>();
         _gson                           = new Gson();
@@ -76,9 +76,6 @@ void addDigitalTwin(String digitalTwinModelName, MessageProcessor digitalTwinMes
 
     void addTimer(String modelName, String id, String timerName, TimerType type, Duration interval, TimerHandler handler) {
         ConcurrentHashMap<String,TwinProxy> modelInstances = _modelInstances.get(modelName);
-        if(modelInstances == null) {
-            modelInstances = new ConcurrentHashMap<>();
-        }
         TwinProxy proxy = modelInstances.get(id);
         SimulationScheduler scheduler = _simulationSchedulers.get(modelName);
         if (scheduler != null) {
@@ -268,18 +265,19 @@ public void recordAlertMessage(String model, String alertProvider, AlertMessage
     }
 
     public void createInstance(String modelName, String id, DigitalTwinBase instance) {
+        TwinProxy proxy = new TwinProxy(instance);
+        ConcurrentHashMap<String,TwinProxy> modelInstances = _modelInstances.get(modelName);
+        if(modelInstances == null) {
+            modelInstances = new ConcurrentHashMap<>();
+        }
+        modelInstances.put(id, proxy);
         InitContext initContext = new WorkbenchInitContext(this, instance, modelName, id);
         instance.init(initContext);
         SimulationScheduler scheduler = _simulationSchedulers.get(modelName);
-        TwinProxy proxy = new TwinProxy(instance);
         if(scheduler != null) {
             proxy.setProxyState(ProxyState.Active);
             scheduler.addInstance(proxy);
         }
-        ConcurrentHashMap<String,TwinProxy> modelInstances = _modelInstances.get(modelName);
-        if(modelInstances == null) {
-            modelInstances = new ConcurrentHashMap<>();
-        }
         modelInstances.put(id, proxy);
         _modelInstances.put(modelName, modelInstances);
     }