#2854 Safely starting and stopping applications:

- removed blocking the writing of values before data points are initialized;
SCADA-LTS · Apr 19, 2024 · 697b8dc · 697b8dc
1 parent b2f7048
commit 697b8dc
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 31 deletions.
diff --git a/src/com/serotonin/mango/rt/RuntimeManager.java b/src/com/serotonin/mango/rt/RuntimeManager.java
@@ -119,12 +119,11 @@ public class RuntimeManager {
 
 
 	private volatile boolean started = false;
-	private volatile boolean startedDataPoints = false;
 
 	//
 	// Lifecycle
 	synchronized public void initialize(boolean safe) {
-		if (started || startedDataPoints)
+		if (started)
 			throw new ShouldNeverHappenException(
 					"RuntimeManager already started");
 
@@ -1076,21 +1075,12 @@ public boolean isStarted() {
 		return started;
 	}
 
-	public boolean isStartedDataPoints() {
-		return startedDataPoints;
-	}
-
 	private void startPoints() {
-		try {
-			DataPointService dataPointService = new DataPointService();
-			StartStopDataPointsUtils.startPoints(dataPointService, this::startDataPointSafe, this::getDataPoint, this::getRunningDataSource);
-		} finally {
-			this.startedDataPoints = true;
-		}
+		DataPointService dataPointService = new DataPointService();
+		StartStopDataPointsUtils.startPoints(dataPointService, this::startDataPointSafe, this::getDataPoint, this::getRunningDataSource);
 	}
 
 	private void stopPoints() {
-		this.startedDataPoints = false;
 		StartStopDataPointsUtils.stopPoints(this.dataPoints.values(), this::stopDataPointSafe, this::getDataPoint);
 	}
 }
diff --git a/src/com/serotonin/mango/rt/dataImage/DataPointNonSyncRT.java b/src/com/serotonin/mango/rt/dataImage/DataPointNonSyncRT.java
@@ -67,10 +67,6 @@ public DataPointNonSyncRT(DataPointVO vo, PointLocatorRT pointLocator) {
     @Override
     protected void savePointValue(PointValueTime newValue, SetPointSource source,
                                   boolean async) {
-        if(isBlocked()) {
-            return;
-        }
-
         // Null values are not very nice, and since they don't have a specific
         // meaning they are hereby ignored.
         if (newValue == null)

diff --git a/src/com/serotonin/mango/rt/dataImage/DataPointRT.java b/src/com/serotonin/mango/rt/dataImage/DataPointRT.java
@@ -198,10 +198,6 @@ public void setPointValue(PointValueTime newValue, SetPointSource source) {
 
 	protected void savePointValue(PointValueTime newValue, SetPointSource source,
 								  boolean async) {
-		if(isBlocked()) {
-			return;
-		}
-
 		// Null values are not very nice, and since they don't have a specific
 		// meaning they are hereby ignored.
 		if (newValue == null)

diff --git a/src/com/serotonin/mango/rt/dataImage/DataPointSynchronizedRT.java b/src/com/serotonin/mango/rt/dataImage/DataPointSynchronizedRT.java
@@ -50,10 +50,6 @@ public DataPointSynchronizedRT(DataPointVO vo, PointLocatorRT pointLocator) {
     @Override
     protected void savePointValue(PointValueTime newValue, SetPointSource source,
                                   boolean async) {
-        if(isBlocked()) {
-            return;
-        }
-
         // Null values are not very nice, and since they don't have a specific
         // meaning they are hereby ignored.
         if (newValue == null)

diff --git a/src/com/serotonin/mango/rt/dataImage/IDataPointRT.java b/src/com/serotonin/mango/rt/dataImage/IDataPointRT.java
@@ -27,8 +27,4 @@ public interface IDataPointRT extends IDataPoint, ILifecycle, TimeoutClient,
     void initialize();
     @Override
     void terminate();
-
-    default boolean isBlocked() {
-        return !Common.ctx.getRuntimeManager().isStartedDataPoints();
-    }
 }
diff --git a/test/com/serotonin/mango/rt/dataImage/datapointrt/config/ConfigDataPointRtTest.java b/test/com/serotonin/mango/rt/dataImage/datapointrt/config/ConfigDataPointRtTest.java
@@ -215,7 +215,7 @@ private void preconfig() throws Exception {
 
         RuntimeManager runtimeManager = new RuntimeManager();
         runtimeManagerMock = mock(RuntimeManager.class);
-        when(runtimeManagerMock.isStartedDataPoints()).thenReturn(true);
+
         doAnswer(a -> {
             runtimeManager.saveDataPoint((DataPointVO)a.getArguments()[0]);
             return null;

diff --git a/test/utils/mock/MockUtils.java b/test/utils/mock/MockUtils.java
@@ -62,7 +62,7 @@ public static void configMockContextWrapper(RuntimeManager runtimeManager) {
         ServletContext servletContext = new ServletContextMock(a ->
                 a.contains("scriptFunctions") ? "test/scriptFunctions.js" : "".equals(a) ? "test/" : "");
         BackgroundProcessing backgroundProcessing = mock(BackgroundProcessing.class);
-        when(runtimeManager.isStartedDataPoints()).thenReturn(true);
+
         when(contextWrapper.getRuntimeManager()).thenReturn(runtimeManager);
         when(contextWrapper.getServletContext()).thenReturn(servletContext);
         when(contextWrapper.getBackgroundProcessing()).thenReturn(backgroundProcessing);