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

Posted to commits@commons.apache.org by gg...@apache.org on 2018/09/27 22:03:35 UTC

svn commit: r1842185 - /commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/PatternSubtreeConfigurationWrapper.java

Author: ggregory
Date: Thu Sep 27 22:03:35 2018
New Revision: 1842185

URL: http://svn.apache.org/viewvc?rev=1842185&view=rev
Log:
Use Java API instead of custom code.

Modified:
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/PatternSubtreeConfigurationWrapper.java

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/PatternSubtreeConfigurationWrapper.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/PatternSubtreeConfigurationWrapper.java?rev=1842185&r1=1842184&r2=1842185&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/PatternSubtreeConfigurationWrapper.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/PatternSubtreeConfigurationWrapper.java Thu Sep 27 22:03:35 2018
@@ -25,6 +25,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 import java.util.Properties;
 
 import org.apache.commons.configuration2.event.Event;
@@ -469,8 +470,7 @@ public class PatternSubtreeConfiguration
      */
     private String substitute(String pattern)
     {
-        Object value = getInterpolator().interpolate(pattern);
-        return value != null ? value.toString() : null;
+        return Objects.toString(getInterpolator().interpolate(pattern), null);
     }
 
     /**