Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 97617 invoked from network); 5 Jan 2007 19:20:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 5 Jan 2007 19:20:05 -0000 Received: (qmail 62797 invoked by uid 500); 5 Jan 2007 19:20:08 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 62771 invoked by uid 500); 5 Jan 2007 19:20:08 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 62754 invoked by uid 99); 5 Jan 2007 19:20:07 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Jan 2007 11:20:07 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Jan 2007 11:20:00 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 50E901A981A; Fri, 5 Jan 2007 11:19:03 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r493147 - in /directory/trunks/shared/ldap/src: main/antlr/filter-parser.g test/java/org/apache/directory/shared/ldap/filter/FilterParserImplTest.java Date: Fri, 05 Jan 2007 19:19:03 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070105191903.50E901A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: akarasulu Date: Fri Jan 5 11:19:02 2007 New Revision: 493147 URL: http://svn.apache.org/viewvc?view=rev&rev=493147 Log: MERGE(493145) from 0.9.5 branch: fixing bug where recognition exceptions were being swallowed up by the default error handler of the filter parser Modified: directory/trunks/shared/ldap/src/main/antlr/filter-parser.g directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/filter/FilterParserImplTest.java Modified: directory/trunks/shared/ldap/src/main/antlr/filter-parser.g URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/antlr/filter-parser.g?view=diff&rev=493147&r1=493146&r2=493147 ============================================================================== --- directory/trunks/shared/ldap/src/main/antlr/filter-parser.g (original) +++ directory/trunks/shared/ldap/src/main/antlr/filter-parser.g Fri Jan 5 11:19:02 2007 @@ -52,6 +52,7 @@ { k = 5; importVocab = FilterLexer; + defaultErrorHandler=false; } Modified: directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/filter/FilterParserImplTest.java URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/filter/FilterParserImplTest.java?view=diff&rev=493147&r1=493146&r2=493147 ============================================================================== --- directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/filter/FilterParserImplTest.java (original) +++ directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/filter/FilterParserImplTest.java Fri Jan 5 11:19:02 2007 @@ -175,6 +175,21 @@ } + public void testBadEqualsFilter() throws IOException, ParseException + { + try + { + parser.parse( "ou = people" ); + + // The parsing should fail + fail( "should fail with bad filter" ); + } + catch( ParseException pe ) + { + } + } + + public void testEqualsWithForwardSlashFilter() throws IOException, ParseException { SimpleNode node = ( SimpleNode ) parser.parse( "( ou = people/in/my/company )" );