[felix-dev] branch master updated: FELIX-6459 : Support escaping of directive separator

[cziegeler]

This is an automated email from the ASF dual-hosted git repository.

cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git


The following commit(s) were added to refs/heads/master by this push:
     new 5b39a4e  FELIX-6459 : Support escaping of directive separator
5b39a4e is described below

commit 5b39a4e7ce9c37b37fa972feb921d2d333c4d020
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Sat Sep 4 19:12:33 2021 +0200

    FELIX-6459 : Support escaping of directive separator
---
 .../apache/felix/configadmin/plugin/interpolation/Interpolator.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git 
a/configadmin-plugins/interpolation/src/main/java/org/apache/felix/configadmin/plugin/interpolation/Interpolator.java
 
b/configadmin-plugins/interpolation/src/main/java/org/apache/felix/configadmin/plugin/interpolation/Interpolator.java
index a1b0618..9e8c9f0 100755
--- 
a/configadmin-plugins/interpolation/src/main/java/org/apache/felix/configadmin/plugin/interpolation/Interpolator.java
+++ 
b/configadmin-plugins/interpolation/src/main/java/org/apache/felix/configadmin/plugin/interpolation/Interpolator.java
@@ -156,7 +156,10 @@ public class Interpolator {
                     return replacement;
                 }
                 // replace and continue with replacement
-                result = result.substring(0, 
boundaries[0]).concat(replacement.toString()).concat(result.substring(boundaries[1]
 + 1));
+                replacement = replace(replacement.toString(), provider);
+                final String val = replacement.toString();
+                result = result.substring(0, 
boundaries[0]).concat(val).concat(result.substring(boundaries[1] + 1));
+                index = boundaries[0] + val.length();
             }
         }
         return result;