You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@directory.apache.org by go...@apache.org on 2012/09/08 13:41:08 UTC

svn commit: r1382284 - /directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/MasterTableWrapper.java

Author: gokturk
Date: Sat Sep  8 11:41:07 2012
New Revision: 1382284

URL: http://svn.apache.org/viewvc?rev=1382284&view=rev
Log:
Reverted back, since we need more sophisticated solution then ignoring current entry for this bug.

Modified:
    directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/MasterTableWrapper.java

Modified: directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/MasterTableWrapper.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/MasterTableWrapper.java?rev=1382284&r1=1382283&r2=1382284&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/MasterTableWrapper.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/txn/MasterTableWrapper.java Sat Sep  8 11:41:07 2012
@@ -175,7 +175,8 @@ public class MasterTableWrapper implemen
             return null;
         }
 
-        Entry entry = logManager.mergeUpdates( partitionDn, key, null );
+        Entry originalEntry = wrappedTable.get( key );
+        Entry entry = logManager.mergeUpdates( partitionDn, key, originalEntry );
 
         return entry;
     }