You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by da...@apache.org on 2019/07/26 14:53:49 UTC

svn commit: r1863816 - in /felix/trunk/configadmin-plugins/interpolation/src: main/java/org/apache/felix/configadmin/plugin/interpolation/ test/java/org/apache/felix/configadmin/plugin/interpolation/

Author: davidb
Date: Fri Jul 26 14:53:49 2019
New Revision: 1863816

URL: http://svn.apache.org/viewvc?rev=1863816&view=rev
Log:
Minor bugfix for the interpolation.

Modified:
    felix/trunk/configadmin-plugins/interpolation/src/main/java/org/apache/felix/configadmin/plugin/interpolation/InterpolationConfigurationPlugin.java
    felix/trunk/configadmin-plugins/interpolation/src/test/java/org/apache/felix/configadmin/plugin/interpolation/InterpolationConfigurationPluginTest.java

Modified: felix/trunk/configadmin-plugins/interpolation/src/main/java/org/apache/felix/configadmin/plugin/interpolation/InterpolationConfigurationPlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/configadmin-plugins/interpolation/src/main/java/org/apache/felix/configadmin/plugin/interpolation/InterpolationConfigurationPlugin.java?rev=1863816&r1=1863815&r2=1863816&view=diff
==============================================================================
--- felix/trunk/configadmin-plugins/interpolation/src/main/java/org/apache/felix/configadmin/plugin/interpolation/InterpolationConfigurationPlugin.java (original)
+++ felix/trunk/configadmin-plugins/interpolation/src/main/java/org/apache/felix/configadmin/plugin/interpolation/InterpolationConfigurationPlugin.java Fri Jul 26 14:53:49 2019
@@ -43,7 +43,7 @@ class InterpolationConfigurationPlugin i
     private static final Pattern SECRET_PATTERN = createPattern(SECRET_PREFIX);
 
     private static Pattern createPattern(String prefix) {
-        return Pattern.compile("\\Q" + prefix + "\\E.+\\Q" + SUFFIX + "\\E");
+        return Pattern.compile("\\Q" + prefix + "\\E.+?\\Q" + SUFFIX + "\\E");
     }
 
     private final BundleContext context;

Modified: felix/trunk/configadmin-plugins/interpolation/src/test/java/org/apache/felix/configadmin/plugin/interpolation/InterpolationConfigurationPluginTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/configadmin-plugins/interpolation/src/test/java/org/apache/felix/configadmin/plugin/interpolation/InterpolationConfigurationPluginTest.java?rev=1863816&r1=1863815&r2=1863816&view=diff
==============================================================================
--- felix/trunk/configadmin-plugins/interpolation/src/test/java/org/apache/felix/configadmin/plugin/interpolation/InterpolationConfigurationPluginTest.java (original)
+++ felix/trunk/configadmin-plugins/interpolation/src/test/java/org/apache/felix/configadmin/plugin/interpolation/InterpolationConfigurationPluginTest.java Fri Jul 26 14:53:49 2019
@@ -78,12 +78,12 @@ public class InterpolationConfigurationP
         }
 
         Dictionary<String, Object> dict = new Hashtable<>();
-        dict.put("cur.user", "$[env:" + userVar + "]");
+        dict.put("cur.user", "YY$[env:" + userVar + "]X$[env:" + userVar + "]YY");
         dict.put("someprop", "$[prop:foo.bar]");
         dict.put("nope", "$[blah:blah]");
 
         plugin.modifyConfiguration(null, dict);
-        assertEquals(envUser, dict.get("cur.user"));
+        assertEquals("YY" + envUser + "X" + envUser + "YY", dict.get("cur.user"));
         assertEquals("hello there", dict.get("someprop"));
         assertEquals("$[blah:blah]", dict.get("nope"));
     }