You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@uima.apache.org by bu...@apache.org on 2013/12/06 16:14:44 UTC

svn commit: r1548559 - /uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java

Author: burn
Date: Fri Dec  6 15:14:44 2013
New Revision: 1548559

URL: http://svn.apache.org/r1548559
Log:
UIMA-3487 Don't try to trim null

Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java?rev=1548559&r1=1548558&r2=1548559&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java Fri Dec  6 15:14:44 2013
@@ -166,7 +166,7 @@ public class DuccPropertiesResolver {
         if(value == null) {
             value = defaultProperties.getProperty(key);
         }
-        return value.trim();
+        return value==null ? null : value.trim();
     }
     
     public String getFileProperty(String key) {
@@ -176,6 +176,6 @@ public class DuccPropertiesResolver {
         if(value == null) {
             value = defaultProperties.getProperty(key);
         }
-        return value.trim();
+        return value==null ? null : value.trim();
     }
 }