Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 86861 invoked from network); 13 Feb 2007 18:23:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 13 Feb 2007 18:23:54 -0000 Received: (qmail 62594 invoked by uid 500); 13 Feb 2007 18:24:01 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 62538 invoked by uid 500); 13 Feb 2007 18:24:01 -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 62527 invoked by uid 99); 13 Feb 2007 18:24:01 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Feb 2007 10:24:01 -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; Tue, 13 Feb 2007 10:23:53 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 620891A981F; Tue, 13 Feb 2007 10:23:33 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r507138 - /directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/referral/ReferralLut.java Date: Tue, 13 Feb 2007 18:23:33 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070213182333.620891A981F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Tue Feb 13 10:23:32 2007 New Revision: 507138 URL: http://svn.apache.org/viewvc?view=rev&rev=507138 Log: Simple reformatting (adding some newlines, some curly braces) Modified: directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/referral/ReferralLut.java Modified: directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/referral/ReferralLut.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/referral/ReferralLut.java?view=diff&rev=507138&r1=507137&r2=507138 ============================================================================== --- directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/referral/ReferralLut.java (original) +++ directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/referral/ReferralLut.java Tue Feb 13 10:23:32 2007 @@ -84,8 +84,12 @@ public LdapDN getFarthestReferralAncestor( LdapDN dn ) { if ( dn == null ) + { throw new IllegalArgumentException( "dn cannot be null" ); + } + LdapDN farthest = new LdapDN(); + for ( int ii = 0; ii < dn.size(); ii++ ) { try @@ -96,12 +100,14 @@ { log.error( "Should never get this when moving names from a proper normalized name!", e ); } + // do not return dn if it is the farthest referral - if ( isReferral( farthest ) && farthest.size() != dn.size() ) + if ( isReferral( farthest ) && ( farthest.size() != dn.size() ) ) { return farthest; } } + return null; }