svn commit: r432295 - /incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/ldap/Parser.java

[pa...@apache.org]

Author: pauls
Date: Thu Aug 17 09:42:46 2006
New Revision: 432295

URL: http://svn.apache.org/viewvc?rev=432295&view=rev
Log:
Fix a lowlevel bug in the ldap parser that was causing it to match:

value=orgfoobar
filter=org*foo*foo*bar

plus, remove a simple 1.4 dependency.


Modified:
    incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/ldap/Parser.java

Modified: incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/ldap/Parser.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/ldap/Parser.java?rev=432295&r1=432294&r2=432295&view=diff
==============================================================================
--- incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/ldap/Parser.java (original)
+++ incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/ldap/Parser.java Thu Aug 17 09:42:46 2006
@@ -1090,10 +1090,11 @@
             Boolean result = Boolean.FALSE;
             int len = pieces.length;
 
-            loop : for (int i = 0; i < len; i++)
+            int index = 0;
+            for (int i = 0; i < len; i++)
             {
                 String piece = (String) pieces[i];
-                int index = 0;
+                
                 if (i == len - 1)
                 {
                     // this is the last piece
@@ -1105,7 +1106,7 @@
                     {
                         result = Boolean.FALSE;
                     }
-                    break loop;
+                    break;
                 }
                 // initial non-star; assert index == 0
                 else if (i == 0)
@@ -1113,7 +1114,7 @@
                     if (!s.startsWith(piece))
                     {
                         result = Boolean.FALSE;
-                        break loop;
+                        break;
                     }
                 }
                 // assert i > 0 && i < len-1
@@ -1124,7 +1125,7 @@
                     if (index < 0)
                     {
                         result = Boolean.FALSE;
-                        break loop;
+                        break;
                     }
                 }
                 // start beyond the matching piece
@@ -1310,13 +1311,11 @@
             }
             catch (Exception ex)
             {
-                String msg = (ex.getCause() == null)
-                    ? ex.toString() : ex.getCause().toString();
                 throw new EvaluationException(
                     "Could not instantiate class "
                         + lhsClass.getName()
                         + " with constructor String parameter "
-                        + rhs + " " + msg);
+                        + rhs + " " + ex);
             }
 
             Comparable lhsComparable = (Comparable) lhs;