#2755 Signaling the Data Source that has a problem:

- fixed ASCIIFileDataSource, BACnetIPDataSourceRT;
SCADA-LTS · Sep 6, 2024 · 1729a25 · 1729a25
1 parent 8ca8ed4
commit 1729a25
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/br/org/scadabr/rt/dataSource/asciiFile/ASCIIFileDataSource.java b/src/br/org/scadabr/rt/dataSource/asciiFile/ASCIIFileDataSource.java
@@ -44,6 +44,7 @@ protected void doPoll(long time) {
 					new LocalizableMessage("event.exception2", vo.getName(),
 							"Arquivo não encontrado!"));
 		} else {
+			returnToNormal(DATA_SOURCE_EXCEPTION_EVENT, time);
 			String arquivo = readFile(file);
 
 			for (DataPointRT dataPoint : dataPoints) {
@@ -61,6 +62,7 @@ protected void doPoll(long time) {
 									new LocalizableMessage("event.exception2",
 											vo.getName(), e.getMessage()), dataPoint);
 							timestamp = time;
+							return;
 						}
 
 					}

diff --git a/src/com/serotonin/mango/rt/dataSource/bacnet/BACnetIPDataSourceRT.java b/src/com/serotonin/mango/rt/dataSource/bacnet/BACnetIPDataSourceRT.java
@@ -407,7 +407,6 @@ void pollDevice(RemoteDevice d, List<DataPointRT> points, long time) {
                 BACnetIPPointLocatorRT locator = dp.getPointLocator();
                 Encodable encodable = values.getNoErrorCheck(locator.getOid(), locator.getPid());
                 dereferencePoint(dp, encodable, time);
-                returnToNormal(dp);
             }
         }
         catch (BACnetException e) {
@@ -425,7 +424,6 @@ public void forcePointRead(DataPointRT dataPoint) {
             ReadPropertyRequest req = new ReadPropertyRequest(locator.getOid(), locator.getPid());
             ReadPropertyAck ack = (ReadPropertyAck) localDevice.send(d, req);
             dereferencePoint(dataPoint, ack.getValue(), System.currentTimeMillis());
-            returnToNormal(dataPoint);
         }
         catch (BACnetException e) {
             fireMessageExceptionEvent(dataPoint, "event.bacnet.readDevice", d.getAddress().toIpString(), e.getMessage());