directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kayyag...@apache.org
Subject svn commit: r1128727 - /directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java
Date Sat, 28 May 2011 18:22:22 GMT
Author: kayyagari
Date: Sat May 28 18:22:22 2011
New Revision: 1128727

URL: http://svn.apache.org/viewvc?rev=1128727&view=rev
Log:
o fixed an NPE (getEntry() is returning null in moveContext)

Modified:
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java?rev=1128727&r1=1128726&r2=1128727&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java
(original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java
Sat May 28 18:22:22 2011
@@ -254,7 +254,7 @@ public class SyncReplSearchListener impl
 
     public void entryMoved( MoveOperationContext moveContext )
     {
-        Entry entry = moveContext.getEntry();
+        Entry entry = moveContext.getOriginalEntry();
 
         LOG.debug( "sending moved entry {}", entry.getDn() );
 
@@ -262,7 +262,7 @@ public class SyncReplSearchListener impl
         {
             if ( !moveContext.getNewSuperior().isDescendantOf( clientMsgLog.getSearchCriteria().getBase()
) )
             {
-                sendDeletedEntry( moveContext.getEntry() );
+                sendDeletedEntry( entry );
                 return;
             }
 



Mime
View raw message