Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 26550 invoked from network); 3 Aug 2006 23:23:40 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 3 Aug 2006 23:23:40 -0000 Received: (qmail 74938 invoked by uid 500); 3 Aug 2006 23:23:39 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 74902 invoked by uid 500); 3 Aug 2006 23:23: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 74891 invoked by uid 99); 3 Aug 2006 23:23:39 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Aug 2006 16:23:39 -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; Thu, 03 Aug 2006 16:23:39 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 9E2411A981A; Thu, 3 Aug 2006 16:23:18 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r428562 - /directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResult.java Date: Thu, 03 Aug 2006 23:23:18 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060803232318.9E2411A981A@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: Thu Aug 3 16:23:17 2006 New Revision: 428562 URL: http://svn.apache.org/viewvc?rev=428562&view=rev Log: Fixed half of DIRSERVER-693. No more NPE in LdapResult.toString() method Modified: directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResult.java Modified: directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResult.java URL: http://svn.apache.org/viewvc/directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResult.java?rev=428562&r1=428561&r2=428562&view=diff ============================================================================== --- directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResult.java (original) +++ directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResult.java Thu Aug 3 16:23:17 2006 @@ -546,8 +546,8 @@ sb.append( "Unknown error code : " ).append( resultCode ); } - sb.append( " Matched DN : '" ).append( matchedDN.toString() ).append( "'\n" ); - sb.append( " Error message : '" ).append( errorMessage.toString() ).append( "'\n" ); + sb.append( " Matched DN : '" ).append( matchedDN == null ? "": matchedDN.toString() ).append( "'\n" ); + sb.append( " Error message : '" ).append( errorMessage == null ? "" : errorMessage.toString() ).append( "'\n" ); if ( referrals.size() != 0 ) { @@ -558,7 +558,7 @@ LdapURL referral = ( LdapURL ) referrals.get( i ); - sb.append( " Referral[" ).append( i ).append( "] :" ).append( referral.toString() ) + sb.append( " Referral[" ).append( i ).append( "] :" ).append( referral == null ? "" : referral.toString() ) .append( '\n' ); } }