directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kayyag...@apache.org
Subject svn commit: r1506921 - /directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java
Date Thu, 25 Jul 2013 12:09:07 GMT
Author: kayyagari
Date: Thu Jul 25 12:09:07 2013
New Revision: 1506921

URL: http://svn.apache.org/r1506921
Log:
clone the entry before filtering to avoid concurrent modification error (DIRSERVER-1875)

Modified:
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.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=1506921&r1=1506920&r2=1506921&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
Thu Jul 25 12:09:07 2013
@@ -195,8 +195,11 @@ public class PersistentSearchListener im
 
         SearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId() );
         respEntry.setObjectName( modifyContext.getDn() );
-        filterEntry( modifyContext.getAlteredEntry() );
-        respEntry.setEntry( modifyContext.getAlteredEntry() );
+        
+        Entry entry = new ClonedServerEntry( modifyContext.getAlteredEntry() );
+        filterEntry( entry );
+        respEntry.setEntry( entry );
+
         setECResponseControl( respEntry, modifyContext, ChangeType.MODIFY );
         session.getIoSession().write( respEntry );
     }



Mime
View raw message