Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 98935 invoked from network); 11 Jan 2007 04:57:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 11 Jan 2007 04:57:21 -0000 Received: (qmail 8119 invoked by uid 500); 11 Jan 2007 04:57:27 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 8069 invoked by uid 500); 11 Jan 2007 04:57:27 -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 8058 invoked by uid 99); 11 Jan 2007 04:57:27 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Jan 2007 20:57:27 -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; Wed, 10 Jan 2007 20:57:20 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id D6E111A981A; Wed, 10 Jan 2007 20:56:19 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r495114 - /directory/trunks/apacheds/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultAttributeTypeRegistry.java Date: Thu, 11 Jan 2007 04:56:19 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070111045619.D6E111A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: akarasulu Date: Wed Jan 10 20:56:18 2007 New Revision: 495114 URL: http://svn.apache.org/viewvc?view=rev&rev=495114 Log: fixed NPE causing bug Modified: directory/trunks/apacheds/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultAttributeTypeRegistry.java Modified: directory/trunks/apacheds/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultAttributeTypeRegistry.java URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultAttributeTypeRegistry.java?view=diff&rev=495114&r1=495113&r2=495114 ============================================================================== --- directory/trunks/apacheds/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultAttributeTypeRegistry.java (original) +++ directory/trunks/apacheds/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultAttributeTypeRegistry.java Wed Jan 10 20:56:18 2007 @@ -129,7 +129,12 @@ protected void onRegisterAddToAncestorDescendants( AttributeType newType, AttributeType ancestor ) throws NamingException { - if ( ancestor == null || ancestor.getName().equals( "top" ) ) + if ( ancestor == null ) + { + return; + } + + if ( ancestor.getName() != null && ancestor.getName().equals( "top" ) ) { return; }