Accept RMI timeout as integer in addition to just string (#170)

* Accept RMI timeout as integer in addition to just string
DataDog · Apr 20, 2018 · 7c83397 · 7c83397
1 parent f1f633e
commit 7c83397
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/src/main/java/org/datadog/jmxfetch/RemoteConnection.java b/src/main/java/org/datadog/jmxfetch/RemoteConnection.java
@@ -32,13 +32,21 @@ public RemoteConnection(LinkedHashMap<String, Object> connectionParams)
         } catch(ClassCastException e) {
             port = Integer.parseInt((String) connectionParams.get("port"));
         }
-        user = (String) connectionParams.get("user");
-        password = (String) connectionParams.get("password");
-        jmx_url = (String) connectionParams.get("jmx_url");
-        rmi_timeout = (String) connectionParams.get("rmi_client_timeout");
+
+        try{
+            rmi_timeout = (String) connectionParams.get("rmi_client_timeout");
+        } catch(ClassCastException e) {
+            rmi_timeout = Integer.toString((Integer) connectionParams.get("rmi_client_timeout"));    
+        } 
+
         if (rmi_timeout == null) {
             rmi_timeout = DEFAULT_RMI_RESPONSE_TIMEOUT;
         }
+
+        user = (String) connectionParams.get("user");
+        password = (String) connectionParams.get("password");
+        jmx_url = (String) connectionParams.get("jmx_url");
+
         if (connectionParams.containsKey("path")){
             path = (String) connectionParams.get("path");
         }