0003973: Putting in non-numeric string for numeric parameters causes

error
JumpMind · May 20, 2019 · c659520 · c659520
1 parent 846b135
commit c659520
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/...tric-core/src/main/java/org/jumpmind/symmetric/service/impl/AbstractParameterService.java b/...tric-core/src/main/java/org/jumpmind/symmetric/service/impl/AbstractParameterService.java
@@ -73,7 +73,11 @@ public AbstractParameterService() {
     public BigDecimal getDecimal(String key, BigDecimal defaultVal) {
         String val = getString(key);
         if (val != null) {
-            return new BigDecimal(val);
+            try {
+                return new BigDecimal(val);
+            } catch (NumberFormatException ex) {
+                TypedProperties.logPropertiesException(log, key, val);
+            }
         }
         return defaultVal;
     }
@@ -106,8 +110,12 @@ public int getInt(String key) {
 
     public int getInt(String key, int defaultVal) {
         String val = getString(key);
-        if (StringUtils.isNotBlank(val)) {
-            return Integer.parseInt(val.trim());
+        if (val != null) {
+            try {
+                return Integer.parseInt(val.trim());
+            } catch (NumberFormatException ex) {
+                TypedProperties.logPropertiesException(log, key, val);
+            }
         }
         return defaultVal;
     }
@@ -119,7 +127,11 @@ public long getLong(String key) {
     public long getLong(String key, long defaultVal) {
         String val = getString(key);
         if (val != null) {
-            return Long.parseLong(val);
+            try {
+                return Long.parseLong(val);
+            } catch (NumberFormatException ex) {
+                TypedProperties.logPropertiesException(log, key, val);
+            }
         }
         return defaultVal;
     }

diff --git a/symmetric-util/src/main/java/org/jumpmind/properties/TypedProperties.java b/symmetric-util/src/main/java/org/jumpmind/properties/TypedProperties.java
@@ -30,6 +30,7 @@
 import java.util.Set;
 
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
 import org.jumpmind.exception.IoException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -101,6 +102,7 @@ public long getLong(String key, long defaultValue) {
             try {
                 returnValue = Long.parseLong(value);
             } catch (NumberFormatException ex) {
+                logPropertiesException(log, key, value);
             }
         }
         return returnValue;
@@ -117,6 +119,7 @@ public int getInt(String key, int defaultValue) {
             try {
                 returnValue = Integer.parseInt(value);
             } catch (NumberFormatException ex) {
+                logPropertiesException(log, key, value);
             }
         }
         return returnValue;
@@ -195,5 +198,11 @@ public void merge(Properties properties) {
     public TypedProperties copy() {
         return new TypedProperties(this);
     }
+
+    public static void logPropertiesException(Logger logger, String key, String val) {
+        if (StringUtils.isNotBlank(val)) {
+            logger.error("Could not parse integer from parameter \"" + key + "\"=\"" + val + "\"");
+        }
+    }
 
 }