Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2C799175ED for ; Fri, 13 Mar 2015 17:20:53 +0000 (UTC) Received: (qmail 61602 invoked by uid 500); 13 Mar 2015 17:20:53 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 61560 invoked by uid 500); 13 Mar 2015 17:20:53 -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 61551 invoked by uid 99); 13 Mar 2015 17:20:53 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Mar 2015 17:20:53 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id EE7DFAC02E7 for ; Fri, 13 Mar 2015 17:20:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1666521 - /directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/SchemaObjectWrapper.java Date: Fri, 13 Mar 2015 17:20:52 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150313172052.EE7DFAC02E7@hades.apache.org> Author: elecharny Date: Fri Mar 13 17:20:52 2015 New Revision: 1666521 URL: http://svn.apache.org/r1666521 Log: Forgot to commit a patch submitted by Radovan... Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/SchemaObjectWrapper.java Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/SchemaObjectWrapper.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/SchemaObjectWrapper.java?rev=1666521&r1=1666520&r2=1666521&view=diff ============================================================================== --- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/SchemaObjectWrapper.java (original) +++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/SchemaObjectWrapper.java Fri Mar 13 17:20:52 2015 @@ -53,7 +53,11 @@ public class SchemaObjectWrapper { int h = 37; h += h * 17 + schemaObject.getObjectType().getValue(); - h += h * 17 + schemaObject.getOid().hashCode(); + + if ( schemaObject.getOid() != null ) + { + h += h * 17 + schemaObject.getOid().hashCode(); + } return h; } @@ -77,7 +81,20 @@ public class SchemaObjectWrapper SchemaObject that = ( ( SchemaObjectWrapper ) o ).get(); SchemaObject current = get(); - return ( that.getOid().equals( current.getOid() ) && ( that.getObjectType() == current.getObjectType() ) ); + // Ultimately, that has to be true, regardless of the OID value + if ( that.getObjectType() != current.getObjectType() ) + { + return false; + } + + // If both OID are null, instances are equals + if ( that.getOid() == null ) + { + return ( current.getOid() == null ); + } + + // The that'oid will never be null, we don't really care if current.oid is null here. + return that.getOid().equals( current.getOid() ); }