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 2009/06/19 17:08:34 UTC

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

Author: rickhall
Date: Fri Jun 19 15:08:34 2009
New Revision: 786536

URL: http://svn.apache.org/viewvc?rev=786536&view=rev
Log:
Make LDAP parsing more lenient for trailing whitespace in filter string.
(FELIX-1256)

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

Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/util/ldap/Parser.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/ldap/Parser.java?rev=786536&r1=786535&r2=786536&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/util/ldap/Parser.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/util/ldap/Parser.java Fri Jun 19 15:08:34 2009
@@ -122,11 +122,14 @@
         {
             return ok;
         }
-        int ch = lexer.get();
-        if (ch != EOF)
+        // Ignore trailing whitespace.
+        for (int ch = lexer.get(); ch != EOF; ch = lexer.get())
         {
-            throw new ParseException(
-                "expected <EOF>; found '" + ((char) ch) + "'");
+            if (!Character.isWhitespace(ch))
+            {
+                throw new ParseException(
+                    "expected <EOF>; found '" + ((char) ch) + "'");
+            }
         }
         return ok;
     }