Default timeout to transport timeout when given value is 0.

MangoAutomation · Jun 2, 2017 · aa577fc · aa577fc
1 parent db4c98b
commit aa577fc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/main/java/com/serotonin/bacnet4j/LocalDevice.java b/src/main/java/com/serotonin/bacnet4j/LocalDevice.java
@@ -480,6 +480,13 @@ public LocalDevice withNumberOfApduRetries(final UnsignedInteger numberOfApduRet
         return this;
     }
 
+    /**
+     * Returns the currently configured timeout in ms within the transport.
+     */
+    public int getTransportTimeout() {
+        return transport.getTimeout();
+    }
+
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // Local object management

diff --git a/src/main/java/com/serotonin/bacnet4j/util/PropertyUtils.java b/src/main/java/com/serotonin/bacnet4j/util/PropertyUtils.java
@@ -84,6 +84,13 @@ public static DeviceObjectPropertyValues readProperties(final LocalDevice localD
      */
     public static DeviceObjectPropertyValues readProperties(final LocalDevice localDevice,
             final DeviceObjectPropertyReferences refs, final ReadListener callback, final long deviceTimeout) {
+        final long timeoutToUse;
+        if (deviceTimeout <= 0) {
+            timeoutToUse = localDevice.getTransportTimeout();
+        } else {
+            timeoutToUse = deviceTimeout;
+        }
+
         final DeviceObjectPropertyValues result = new DeviceObjectPropertyValues();
 
         final Map<Integer, PropertyReferences> properties = refs.getProperties();
@@ -156,7 +163,7 @@ public static DeviceObjectPropertyValues readProperties(final LocalDevice localD
             if (rd == null) {
                 // Initiate a device lookup
                 runnable = () -> {
-                    requestPropertiesFromDevice(localDevice, deviceId, deviceTimeout, propRefs, callback, result,
+                    requestPropertiesFromDevice(localDevice, deviceId, timeoutToUse, propRefs, callback, result,
                             completedProperties, totalProperties);
                 };
             } else {
@@ -169,7 +176,7 @@ public static DeviceObjectPropertyValues readProperties(final LocalDevice localD
                         // The cached device appears to be offline. Remove it from the cache, and try discovering it
                         // again in case its address changed.
                         localDevice.removeCachedRemoteDevice(deviceId);
-                        requestPropertiesFromDevice(localDevice, deviceId, deviceTimeout, propRefs, callback, result,
+                        requestPropertiesFromDevice(localDevice, deviceId, timeoutToUse, propRefs, callback, result,
                                 completedProperties, totalProperties);
                     }
                 };