You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2010/06/23 15:00:47 UTC

svn commit: r957179 [2/2] - in /directory/apacheds/trunk: ./ core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ core-integ/src/test/java/...

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java?rev=957179&r1=957178&r2=957179&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java Wed Jun 23 13:00:43 2010
@@ -166,7 +166,7 @@ public class PersistentSearchListener im
     
         InternalSearchResponseEntry respEntry = new SearchResponseEntryImpl( req.getMessageId() );
         respEntry.setObjectName( modifyContext.getDn() );
-        respEntry.setEntry( modifyContext.getModifiedEntry() );
+        respEntry.setEntry( modifyContext.getAlteredEntry() );
         setECResponseControl( respEntry, modifyContext, ChangeType.MODIFY );
         session.getIoSession().write( respEntry );
     }

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=957179&r1=957178&r2=957179&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 Wed Jun 23 13:00:43 2010
@@ -212,7 +212,7 @@ public class SyncReplSearchListener impl
     
     public void entryModified( ModifyOperationContext modifyContext )
     {
-        Entry alteredEntry = modifyContext.getModifiedEntry();
+        Entry alteredEntry = modifyContext.getAlteredEntry();
 
         LOG.debug( "sending modified entry {}", alteredEntry.getDn() );
 
@@ -239,7 +239,7 @@ public class SyncReplSearchListener impl
             }
             else
             {
-                clientMsgLog.log( EventType.MODIFY, modifyContext.getModifiedEntry() );
+                clientMsgLog.log( EventType.MODIFY, modifyContext.getAlteredEntry() );
             }
         }
         catch ( Exception e )

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/xdbm/AbstractXdbmPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/xdbm/AbstractXdbmPartition.java?rev=957179&r1=957178&r2=957179&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/xdbm/AbstractXdbmPartition.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/xdbm/AbstractXdbmPartition.java Wed Jun 23 13:00:43 2010
@@ -305,7 +305,7 @@ public abstract class AbstractXdbmPartit
         try
         {
             Entry modifiedEntry = store.modify( modifyContext.getDn(), modifyContext.getModItems() );
-            modifyContext.setModifiedEntry( modifiedEntry );
+            modifyContext.setAlteredEntry( modifiedEntry );
         }
         catch ( Exception e )
         {