| commit | b60396e9eb397ec99b33e2785f9830d7fad2e0dd | [log] [tgz] |
|---|---|---|
| author | Carsten Ziegeler <cziegeler@apache.org> | Thu Feb 27 11:11:28 2020 +0000 |
| committer | Carsten Ziegeler <cziegeler@apache.org> | Thu Feb 27 11:11:28 2020 +0000 |
| tree | 8ed1a42eb8e22471ea05a3f733964ba4a936c37b | |
| parent | 611ccdaccc87cf6e94d5f2abedfc1f2af3dc72fe [diff] |
FELIX-6224 : Parsing error when placeholder containts array type git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1874566 13f79535-47bb-0310-9956-ffa450edef68
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 51de22b..cb98fd6 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
@@ -77,6 +77,9 @@ while (index < result.length() && count > 0) { if (result.charAt(index) == '[' && result.charAt(index - 1) == '$') { count++; + } else if (result.charAt(index) == '[' && index < result.length() - 1 + && result.charAt(index + 1) == ']') { + count++; } else if (result.charAt(index) == END) { count--; }