Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 34133 invoked from network); 29 Oct 2010 17:05:50 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 29 Oct 2010 17:05:50 -0000 Received: (qmail 47207 invoked by uid 500); 29 Oct 2010 17:05:50 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 47172 invoked by uid 500); 29 Oct 2010 17:05:50 -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 47164 invoked by uid 99); 29 Oct 2010 17:05:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Oct 2010 17:05:50 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Oct 2010 17:05:49 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 431CA2388A32; Fri, 29 Oct 2010 17:04:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1028848 - in /directory/shared/trunk/ldap/src: main/java/org/apache/directory/shared/ldap/filter/ test/java/org/apache/directory/shared/ldap/filter/ Date: Fri, 29 Oct 2010 17:04:53 -0000 To: commits@directory.apache.org From: felixk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101029170453.431CA2388A32@eris.apache.org> Author: felixk Date: Fri Oct 29 17:04:52 2010 New Revision: 1028848 URL: http://svn.apache.org/viewvc?rev=1028848&view=rev Log: Fix DIRSHARED-69 Thanks Steven for pointing Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AbstractExprNode.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ApproximateNode.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/EqualityNode.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/GreaterEqNode.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LessEqNode.java directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/FilterToStringTest.java Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AbstractExprNode.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AbstractExprNode.java?rev=1028848&r1=1028847&r2=1028848&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AbstractExprNode.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AbstractExprNode.java Fri Oct 29 17:04:52 2010 @@ -145,6 +145,11 @@ public abstract class AbstractExprNode i */ protected static Value escapeFilterValue( Value value ) { + if ( value.isNull() ) + { + return value; + } + StringBuilder sb = null; String val; @@ -195,7 +200,7 @@ public abstract class AbstractExprNode i sb.append( digit.toUpperCase() ); } } - + return new StringValue( sb.toString() ); } Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ApproximateNode.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ApproximateNode.java?rev=1028848&r1=1028847&r2=1028848&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ApproximateNode.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ApproximateNode.java Fri Oct 29 17:04:52 2010 @@ -72,7 +72,13 @@ public class ApproximateNode extends buf.append( attribute ); } - buf.append( "~=" ).append( getEscapedValue() ); + buf.append( "~=" ); + + Value escapedValue = getEscapedValue(); + if ( !escapedValue.isNull()) + { + buf.append( escapedValue ); + } buf.append( super.toString() ); Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/EqualityNode.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/EqualityNode.java?rev=1028848&r1=1028847&r2=1028848&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/EqualityNode.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/EqualityNode.java Fri Oct 29 17:04:52 2010 @@ -74,7 +74,13 @@ public class EqualityNode extends Sim buf.append( attribute ); } - buf.append( "=" ).append( getEscapedValue() ); + buf.append( "=" ); + + Value escapedValue = getEscapedValue(); + if ( !escapedValue.isNull()) + { + buf.append( escapedValue ); + } buf.append( super.toString() ); Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/GreaterEqNode.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/GreaterEqNode.java?rev=1028848&r1=1028847&r2=1028848&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/GreaterEqNode.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/GreaterEqNode.java Fri Oct 29 17:04:52 2010 @@ -74,7 +74,13 @@ public class GreaterEqNode extends Si buf.append( attribute ); } - buf.append( ">=" ).append( getEscapedValue() ); + buf.append( ">=" ); + + Value escapedValue = getEscapedValue(); + if ( !escapedValue.isNull()) + { + buf.append( escapedValue ); + } buf.append( super.toString() ); Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LessEqNode.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LessEqNode.java?rev=1028848&r1=1028847&r2=1028848&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LessEqNode.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LessEqNode.java Fri Oct 29 17:04:52 2010 @@ -74,7 +74,13 @@ public class LessEqNode extends Simpl buf.append( attribute ); } - buf.append( "<=" ).append( getEscapedValue() ); + buf.append( "<=" ); + + Value escapedValue = getEscapedValue(); + if ( !escapedValue.isNull()) + { + buf.append( escapedValue ); + } buf.append( super.toString() ); Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/FilterToStringTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/FilterToStringTest.java?rev=1028848&r1=1028847&r2=1028848&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/FilterToStringTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/FilterToStringTest.java Fri Oct 29 17:04:52 2010 @@ -45,6 +45,34 @@ public class FilterToStringTest String str = "(ou=test)"; ExprNode node = FilterParser.parse( str ); assertEquals( str, node.toString() ); + + str = "(ou~=test)"; + node = FilterParser.parse( str ); + assertEquals( str, node.toString() ); + + str = "(ou>=test)"; + node = FilterParser.parse( str ); + assertEquals( str, node.toString() ); + + str = "(ou<=test)"; + node = FilterParser.parse( str ); + assertEquals( str, node.toString() ); + + str="(ou=)"; + node = FilterParser.parse( str ); + assertEquals( str, node.toString() ); + + str="(ou~=)"; + node = FilterParser.parse( str ); + assertEquals( str, node.toString() ); + + str="(ou>=)"; + node = FilterParser.parse( str ); + assertEquals( str, node.toString() ); + + str="(ou<=)"; + node = FilterParser.parse( str ); + assertEquals( str, node.toString() ); }