Fixed a bug in substring evaluation that Karl discovered in the LDAP
package; we should really eliminate these duplications in the future.


git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@432310 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/framework/src/main/java/org/apache/felix/framework/FindEntriesEnumeration.java b/framework/src/main/java/org/apache/felix/framework/FindEntriesEnumeration.java
index 5eebfe1..61c125a 100644
--- a/framework/src/main/java/org/apache/felix/framework/FindEntriesEnumeration.java
+++ b/framework/src/main/java/org/apache/felix/framework/FindEntriesEnumeration.java
@@ -145,7 +145,7 @@
         int idx = 0;
 
         // We assume (sub)strings can contain leading and trailing blanks
-loop:   for (;;)
+        for (;;)
         {
             if (idx >= target.length())
             {
@@ -163,7 +163,7 @@
                     // the string "" (!=null)
                 }
                 ss.setLength(0);
-                break loop;
+                break;
             }
     
             char c = target.charAt(idx++);
@@ -221,11 +221,11 @@
 
         boolean result = false;
         int len = pieces.length;
+        int index = 0;
 
-loop:   for (int i = 0; i < len; i++)
+        for (int i = 0; i < len; i++)
         {
             String piece = (String) pieces[i];
-            int index = 0;
             if (i == len - 1)
             {
                 // this is the last piece
@@ -237,7 +237,7 @@
                 {
                     result = false;
                 }
-                break loop;
+                break;
             }
             // initial non-star; assert index == 0
             else if (i == 0)
@@ -245,7 +245,7 @@
                 if (!s.startsWith(piece))
                 {
                     result = false;
-                    break loop;
+                    break;
                 }
             }
             // assert i > 0 && i < len-1
@@ -256,7 +256,7 @@
                 if (index < 0)
                 {
                     result = false;
-                    break loop;
+                    break;
                 }
             }
             // start beyond the matching piece
diff --git a/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Export.java b/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Export.java
index b0d8510..e78260b 100644
--- a/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Export.java
+++ b/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4Export.java
@@ -181,7 +181,7 @@
         int idx = 0;
 
         // We assume (sub)strings can contain leading and trailing blanks
-loop:   for (;;)
+        for (;;)
         {
             if (idx >= target.length())
             {
@@ -199,7 +199,7 @@
                     // the string "" (!=null)
                 }
                 ss.setLength(0);
-                break loop;
+                break;
             }
 
             char c = target.charAt(idx++);
@@ -256,11 +256,11 @@
 
         boolean result = false;
         int len = pieces.length;
+        int index = 0;
 
-loop:   for (int i = 0; i < len; i++)
+        for (int i = 0; i < len; i++)
         {
             String piece = (String) pieces[i];
-            int index = 0;
             if (i == len - 1)
             {
                 // this is the last piece
@@ -272,7 +272,7 @@
                 {
                     result = false;
                 }
-                break loop;
+                break;
             }
             // initial non-star; assert index == 0
             else if (i == 0)
@@ -280,7 +280,7 @@
                 if (!s.startsWith(piece))
                 {
                     result = false;
-                    break loop;
+                    break;
                 }
             }
             // assert i > 0 && i < len-1
@@ -291,7 +291,7 @@
                 if (index < 0)
                 {
                     result = false;
-                    break loop;
+                    break;
                 }
             }
             // start beyond the matching piece