Extra fix for configuring part for SMPP-RA issue 9 - SMPP Activities

leak in some error cases from cloud hopper lib
RestComm · May 29, 2017 · 52fd4a9 · 52fd4a9
1 parent 77402be
commit 52fd4a9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/core/smpp-extensions/src/main/java/org/restcomm/smpp/SmppServerManagement.java b/core/smpp-extensions/src/main/java/org/restcomm/smpp/SmppServerManagement.java
@@ -620,7 +620,11 @@ public void load() throws FileNotFoundException {
 			this.autoNegotiateInterfaceVersion = reader.read(AUTO_NEGOTIATION_VERSION, Boolean.class);
 			this.interfaceVersion = reader.read(INTERFACE_VERSION, Double.class);
 			this.maxConnectionSize = reader.read(MAX_CONNECTION_SIZE, Integer.class);
-			this.smppActivityTimeout = reader.read(SMPP_ACTIVITY_TIMEOUT, Integer.class);
+
+            Integer valI = reader.read(SMPP_ACTIVITY_TIMEOUT, Integer.class);
+            if (valI != null)
+                this.smppActivityTimeout = valI;
+
 			this.defaultWindowSize = reader.read(DEFAULT_WINDOW_SIZE, Integer.class);
 			this.defaultWindowWaitTimeout = reader.read(DEFAULT_WINDOW_WAIT_TIMEOUT, Integer.class);
 			this.defaultRequestExpiryTimeout = reader.read(DEFAULT_REQUEST_EXPIRY_TIMEOUT, Integer.class);

diff --git a/management/ui-management/src/main/webapp/modules/smpp-server.html b/management/ui-management/src/main/webapp/modules/smpp-server.html
@@ -70,7 +70,7 @@ <h3 style="margin: 0px;">
 												var autoNegotiateInterfaceVersion = response.value.AutoNegotiateInterfaceVersion;
 												var interfaceVersion = response.value.InterfaceVersion;
 												var maxConnectionSize = response.value.MaxConnectionSize;
-												var smppActivityTimeout = response.value.smppActivityTimeout;
+												var smppActivityTimeout = response.value.SmppActivityTimeout;
 												var defaultWindowSize = response.value.DefaultWindowSize;
 												var defaultWindowWaitTimeout = response.value.DefaultWindowWaitTimeout;
 												var defaultRequestExpiryTimeout = response.value.DefaultRequestExpiryTimeout;