commit 7559e207b258bb084d2e4ac3d07cbd4d62ea9267
author Richard S. Hall <rickhall@apache.org> Fri Jun 19 15:08:34 2009 +0000
committer Richard S. Hall <rickhall@apache.org> Fri Jun 19 15:08:34 2009 +0000
tree 1992f054e38296bd46a83d25be01a60a074bc798
parent e6f751b2f56d80821e96bf1aa6d263f88ed7697b

Make LDAP parsing more lenient for trailing whitespace in filter string.
(FELIX-1256)


git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@786536 13f79535-47bb-0310-9956-ffa450edef68

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

diff --git a/framework/src/main/java/org/apache/felix/framework/util/ldap/Parser.java b/framework/src/main/java/org/apache/felix/framework/util/ldap/Parser.java
index 3845e63..b467988 100644
--- a/framework/src/main/java/org/apache/felix/framework/util/ldap/Parser.java
+++ b/framework/src/main/java/org/apache/felix/framework/util/ldap/Parser.java
@@ -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;
     }