Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 34234 invoked from network); 7 Aug 2008 17:07:40 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 7 Aug 2008 17:07:40 -0000 Received: (qmail 56920 invoked by uid 500); 7 Aug 2008 17:07:40 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 56868 invoked by uid 500); 7 Aug 2008 17:07:39 -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 56855 invoked by uid 99); 7 Aug 2008 17:07:39 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Aug 2008 10:07:39 -0700 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; Thu, 07 Aug 2008 17:06:52 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5A8BF23889C4; Thu, 7 Aug 2008 10:06:22 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r683650 - /directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/LdapURL.java Date: Thu, 07 Aug 2008 17:06:21 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080807170622.5A8BF23889C4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: akarasulu Date: Thu Aug 7 10:06:21 2008 New Revision: 683650 URL: http://svn.apache.org/viewvc?rev=683650&view=rev Log: fixing incorrect toString() method Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/LdapURL.java Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/LdapURL.java URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/LdapURL.java?rev=683650&r1=683649&r2=683650&view=diff ============================================================================== --- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/LdapURL.java (original) +++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/LdapURL.java Thu Aug 7 10:06:21 2008 @@ -1228,10 +1228,9 @@ if ( dn != null ) { sb.append( '/' ).append( urlEncode( dn.toString(), false ) ); - - if ( ( attributes.size() != 0 ) - || ( ( scope != SearchControls.OBJECT_SCOPE ) || ( filter != null ) || - ( extensions.size() != 0 ) || ( criticalExtensions.size() != 0 ) ) ) + sb.append( '?' ); + + if ( attributes.size() != 0 ) { sb.append( '?' ); @@ -1252,92 +1251,87 @@ } } - if ( ( scope != SearchControls.OBJECT_SCOPE ) || ( filter != null ) || ( extensions.size() != 0 ) - || ( criticalExtensions.size() != 0 ) ) + sb.append( '?' ); + + switch ( scope ) { - sb.append( '?' ); - - switch ( scope ) - { - case SearchControls.OBJECT_SCOPE: + case SearchControls.OBJECT_SCOPE: + sb.append( "base" ); + break; + + case SearchControls.ONELEVEL_SCOPE: + sb.append( "one" ); + break; + + case SearchControls.SUBTREE_SCOPE: + sb.append( "sub" ); + break; + + + default : + break; + } - // This is the default value. - break; + if ( ( filter != null ) || ( ( extensions.size() != 0 ) || ( criticalExtensions.size() != 0 ) ) ) + { + sb.append( "?" ); - case SearchControls.ONELEVEL_SCOPE: - sb.append( "one" ); - break; - - case SearchControls.SUBTREE_SCOPE: - sb.append( "sub" ); - break; - - - default : - break; + if ( filter != null ) + { + sb.append( urlEncode( filter, false ) ); } - if ( ( filter != null ) || ( ( extensions.size() != 0 ) || ( criticalExtensions.size() != 0 ) ) ) + if ( ( extensions.size() != 0 ) || ( criticalExtensions.size() != 0 ) ) { - sb.append( "?" ); + sb.append( '?' ); - if ( filter != null ) - { - sb.append( urlEncode( filter, false ) ); - } + boolean isFirst = true; - if ( ( extensions.size() != 0 ) || ( criticalExtensions.size() != 0 ) ) + if ( extensions.size() != 0 ) { - sb.append( '?' ); - - boolean isFirst = true; - - if ( extensions.size() != 0 ) + for ( String key:extensions.keySet() ) { - for ( String key:extensions.keySet() ) - { - if ( !isFirst ) - { - sb.append( ',' ); - } - else - { - isFirst = false; - } - - sb.append( urlEncode( key, false ) ).append( '=' ).append( - urlEncode( extensions.get( key ), true ) ); + if ( !isFirst ) + { + sb.append( ',' ); + } + else + { + isFirst = false; } + + sb.append( urlEncode( key, false ) ).append( '=' ).append( + urlEncode( extensions.get( key ), true ) ); } + } - isFirst = true; + isFirst = true; - if ( criticalExtensions.size() != 0 ) + if ( criticalExtensions.size() != 0 ) + { + for ( String key:criticalExtensions.keySet() ) { - for ( String key:criticalExtensions.keySet() ) + + if ( !isFirst ) + { + sb.append( ",!" ); + } + else { + sb.append( '!' ); + isFirst = false; + } - if ( !isFirst ) - { - sb.append( ",!" ); - } - else - { - sb.append( '!' ); - isFirst = false; - } - - sb.append( urlEncode( key, false ) ); - - String value = criticalExtensions.get( key ); - - if ( value != null ) - { - sb.append( '=' ).append( - urlEncode( value, true ) ); - } + sb.append( urlEncode( key, false ) ); + + String value = criticalExtensions.get( key ); + + if ( value != null ) + { + sb.append( '=' ).append( + urlEncode( value, true ) ); } } }