svn commit: r1874566 - /felix/trunk/configadmin-plugins/interpolation/src/main/java/org/apache/felix/configadmin/plugin/interpolation/Interpolator.java

[cziegeler]

Author: cziegeler
Date: Thu Feb 27 11:11:28 2020
New Revision: 1874566

URL: http://svn.apache.org/viewvc?rev=1874566&view=rev
Log:
FELIX-6224 : Parsing error when placeholder containts array type

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

Modified: 
felix/trunk/configadmin-plugins/interpolation/src/main/java/org/apache/felix/configadmin/plugin/interpolation/Interpolator.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/configadmin-plugins/interpolation/src/main/java/org/apache/felix/configadmin/plugin/interpolation/Interpolator.java?rev=1874566&r1=1874565&r2=1874566&view=diff
==============================================================================
--- 
felix/trunk/configadmin-plugins/interpolation/src/main/java/org/apache/felix/configadmin/plugin/interpolation/Interpolator.java
 (original)
+++ 
felix/trunk/configadmin-plugins/interpolation/src/main/java/org/apache/felix/configadmin/plugin/interpolation/Interpolator.java
 Thu Feb 27 11:11:28 2020
@@ -77,6 +77,9 @@ public class Interpolator {
             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--;
                 }