#65046 - Simplify integration tests

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1885538 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 5 insertions, 3 deletions

diff --git a/src/java/org/apache/poi/util/Configurator.java b/src/java/org/apache/poi/util/Configurator.java
index 7831f0d320..98595babbc 100644
--- a/src/java/org/apache/poi/util/Configurator.java
+++ b/src/java/org/apache/poi/util/Configurator.java
@@ -24,13 +24,15 @@ public class Configurator {
     private static POILogger logger = POILogFactory.getLogger(Configurator.class);
 
     public static int getIntValue(String systemProperty, int defaultValue) {
-        int result = defaultValue;
         String property = System.getProperty(systemProperty);
+        if (property == null || "".equals(property) || "null".equals(property)) {
+            return defaultValue;
+        }
         try {
-            result = Integer.parseInt(property);
+            return Integer.parseInt(property);
         } catch (Exception e) {
             logger.log(POILogger.ERROR, "System property -D", systemProperty, " does not contains a valid integer: ", property);
+            return defaultValue;
         }
-        return result;
     }
 }