From commits-return-9459-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Sat Jul 08 15:47:55 2006 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 68925 invoked from network); 8 Jul 2006 15:47:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 8 Jul 2006 15:47:55 -0000 Received: (qmail 57348 invoked by uid 500); 8 Jul 2006 15:47:55 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 57298 invoked by uid 500); 8 Jul 2006 15:47:54 -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 57287 invoked by uid 99); 8 Jul 2006 15:47:54 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 08 Jul 2006 08:47:54 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 08 Jul 2006 08:47:54 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 1FC621A981F; Sat, 8 Jul 2006 08:47:34 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r420142 - /directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java Date: Sat, 08 Jul 2006 15:47:33 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060708154734.1FC621A981F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: elecharny Date: Sat Jul 8 08:47:33 2006 New Revision: 420142 URL: http://svn.apache.org/viewvc?rev=420142&view=rev Log: Switched from toUpName() to getUpName(); Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java?rev=420142&r1=420141&r2=420142&view=diff ============================================================================== --- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java (original) +++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java Sat Jul 8 08:47:33 2006 @@ -240,7 +240,7 @@ buf.append( ldapUrl.getPort() ); } buf.append( "/" ); - buf.append( urlDn.toUpName() ); + buf.append( urlDn.getUpName() ); list.add( buf.toString() ); } LdapReferralException lre = new LdapReferralException( list ); @@ -281,7 +281,7 @@ Attributes referral = invocation.getProxy().lookup( farthest, DirectoryPartitionNexusProxy.LOOKUP_BYPASS ); AttributeType refsType = attrRegistry.lookup( oidRegistry.getOid( REF_ATTR ) ); Attribute refs = ServerUtils.getAttribute( refsType, referral ); - doReferralException( farthest, new LdapDN( normName.toUpName() ), refs ); + doReferralException( farthest, new LdapDN( normName.getUpName() ), refs ); } else if ( refval.equals( FOLLOW ) ) { @@ -317,7 +317,7 @@ Attributes referral = invocation.getProxy().lookup( farthest, DirectoryPartitionNexusProxy.LOOKUP_BYPASS ); Attribute refs = referral.get( REF_ATTR ); - doReferralException( farthest, new LdapDN( normName.toUpName() ), refs ); + doReferralException( farthest, new LdapDN( normName.getUpName() ), refs ); // we really can't get here since doReferralException will throw an exception return false; @@ -366,7 +366,7 @@ Attributes referral = invocation.getProxy().lookup( farthest, DirectoryPartitionNexusProxy.LOOKUP_BYPASS ); Attribute refs = referral.get( REF_ATTR ); - doReferralException( farthest, new LdapDN( normName.toUpName() ), refs ); + doReferralException( farthest, new LdapDN( normName.getUpName() ), refs ); } else if ( refval.equals( FOLLOW ) ) { @@ -432,7 +432,7 @@ Attributes referral = invocation.getProxy().lookup( farthestSrc, DirectoryPartitionNexusProxy.LOOKUP_BYPASS ); Attribute refs = referral.get( REF_ATTR ); - doReferralException( farthestSrc, new LdapDN( oldName.toUpName() ), refs ); + doReferralException( farthestSrc, new LdapDN( oldName.getUpName() ), refs ); } else if ( farthestDst != null ) { @@ -499,7 +499,7 @@ Attributes referral = invocation.getProxy().lookup( farthestSrc, DirectoryPartitionNexusProxy.LOOKUP_BYPASS ); Attribute refs = referral.get( REF_ATTR ); - doReferralException( farthestSrc, new LdapDN( oldName.toUpName() ), refs ); + doReferralException( farthestSrc, new LdapDN( oldName.getUpName() ), refs ); } else if ( farthestDst != null ) { @@ -570,7 +570,7 @@ Attributes referral = invocation.getProxy().lookup( farthestSrc, DirectoryPartitionNexusProxy.LOOKUP_BYPASS ); Attribute refs = referral.get( REF_ATTR ); - doReferralException( farthestSrc, new LdapDN( oldName.toUpName() ), refs ); + doReferralException( farthestSrc, new LdapDN( oldName.getUpName() ), refs ); } else if ( farthestDst != null ) { @@ -683,7 +683,7 @@ Attributes referral = invocation.getProxy().lookup( farthest, DirectoryPartitionNexusProxy.LOOKUP_BYPASS ); Attribute refs = referral.get( REF_ATTR ); - doReferralException( farthest, new LdapDN( name.toUpName() ), refs ); + doReferralException( farthest, new LdapDN( name.getUpName() ), refs ); } else if ( refval.equals( FOLLOW ) ) { @@ -787,7 +787,7 @@ Attributes referral = invocation.getProxy().lookup( farthest, DirectoryPartitionNexusProxy.LOOKUP_BYPASS ); Attribute refs = referral.get( REF_ATTR ); - doReferralException( farthest, new LdapDN( name.toUpName() ), refs ); + doReferralException( farthest, new LdapDN( name.getUpName() ), refs ); } else if ( refval.equals( FOLLOW ) ) { @@ -922,7 +922,7 @@ Attributes referral = invocation.getProxy().lookup( farthest, DirectoryPartitionNexusProxy.LOOKUP_BYPASS ); Attribute refs = referral.get( REF_ATTR ); - doReferralExceptionOnSearchBase( farthest, new LdapDN( base.toUpName() ), refs, controls.getSearchScope() ); + doReferralExceptionOnSearchBase( farthest, new LdapDN( base.getUpName() ), refs, controls.getSearchScope() ); throw new IllegalStateException( "Should never get here: shutting up compiler" ); } if ( refval.equals( THROW ) ) @@ -944,7 +944,7 @@ Attributes referral = invocation.getProxy().lookup( farthest, DirectoryPartitionNexusProxy.LOOKUP_BYPASS ); Attribute refs = referral.get( REF_ATTR ); - doReferralExceptionOnSearchBase( farthest, new LdapDN( base.toUpName() ), refs, controls.getSearchScope() ); + doReferralExceptionOnSearchBase( farthest, new LdapDN( base.getUpName() ), refs, controls.getSearchScope() ); throw new IllegalStateException( "Should never get here: shutting up compiler" ); } else if ( refval.equals( FOLLOW ) ) @@ -1074,7 +1074,7 @@ buf.append( ldapUrl.getPort() ); } buf.append( "/" ); - buf.append( urlDn.toUpName() ); + buf.append( urlDn.getUpName() ); buf.append( "??" ); switch ( scope )