You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2010/02/20 08:27:45 UTC

svn commit: r912085 - /felix/trunk/framework/src/main/java/org/apache/felix/framework/util/Util.java

Author: rickhall
Date: Sat Feb 20 07:27:44 2010
New Revision: 912085

URL: http://svn.apache.org/viewvc?rev=912085&view=rev
Log:
The substring matching algorithm had a couple bugs in it. (FELIX-2107)

Modified:
    felix/trunk/framework/src/main/java/org/apache/felix/framework/util/Util.java

Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/util/Util.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/Util.java?rev=912085&r1=912084&r2=912085&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/util/Util.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/util/Util.java Sat Feb 20 07:27:44 2010
@@ -619,16 +619,26 @@
         // assert (pieces.length > 1)
         // minimal case is <string>*<string>
 
-        boolean result = false;
+        boolean result = true;
         int len = pieces.length;
 
+        int index = 0;
+
 loop:   for (int i = 0; i < len; i++)
         {
             String piece = pieces[i];
-            int index = 0;
-            if (i == len - 1)
+            // initial non-star; assert index == 0
+            if (i == 0)
+            {
+                if (!s.startsWith(piece))
+                {
+                    result = false;
+                    break loop;
+                }
+            }
+            // this is the last piece
+            else if (i == len - 1)
             {
-                // this is the last piece
                 if (s.endsWith(piece))
                 {
                     result = true;
@@ -639,15 +649,6 @@
                 }
                 break loop;
             }
-            // initial non-star; assert index == 0
-            else if (i == 0)
-            {
-                if (!s.startsWith(piece))
-                {
-                    result = false;
-                    break loop;
-                }
-            }
             // assert i > 0 && i < len-1
             else
             {