directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r947080 - /directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ClonedServerEntry.java
Date Fri, 21 May 2010 17:29:36 GMT
Author: felixk
Date: Fri May 21 17:29:35 2010
New Revision: 947080

URL: http://svn.apache.org/viewvc?rev=947080&view=rev
Log:
Fix NPE

Modified:
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ClonedServerEntry.java

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ClonedServerEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ClonedServerEntry.java?rev=947080&r1=947079&r2=947080&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ClonedServerEntry.java
(original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ClonedServerEntry.java
Fri May 21 17:29:35 2010
@@ -476,8 +476,14 @@ public class ClonedServerEntry implement
         {
             return false;
         }
-
-        return clonedEntry.equals( other );
+        if ( clonedEntry == null)
+        {
+            return other == null;
+        }
+        else
+        {
+            return clonedEntry.equals( other );
+        }
     }
     
     



Mime
View raw message