directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gokt...@apache.org
Subject svn commit: r1377448 - /directory/apacheds/branches/apacheds-txns/core-shared/src/test/java/org/apache/directory/server/core/shared/txn/EntryUpdateMergeTest.java
Date Sun, 26 Aug 2012 15:43:27 GMT
Author: gokturk
Date: Sun Aug 26 15:43:27 2012
New Revision: 1377448

URL: http://svn.apache.org/viewvc?rev=1377448&view=rev
Log:
* Fix to Randomly Failing Test: We have to get the current version from the MasterTable for
modification tests, since we can't be sure if consecutively issued transactions will remain
in commit queue.

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

Modified: directory/apacheds/branches/apacheds-txns/core-shared/src/test/java/org/apache/directory/server/core/shared/txn/EntryUpdateMergeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-shared/src/test/java/org/apache/directory/server/core/shared/txn/EntryUpdateMergeTest.java?rev=1377448&r1=1377447&r2=1377448&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-shared/src/test/java/org/apache/directory/server/core/shared/txn/EntryUpdateMergeTest.java
(original)
+++ directory/apacheds/branches/apacheds-txns/core-shared/src/test/java/org/apache/directory/server/core/shared/txn/EntryUpdateMergeTest.java
Sun Aug 26 15:43:27 2012
@@ -261,7 +261,8 @@ public class EntryUpdateMergeTest extend
     {
         try
         {
-            Entry updated = txnLogManager.mergeUpdates( dn, updatedEntryId, toUpdate );
+            Entry updated = txnLogManager.mergeUpdates( dn, updatedEntryId,
+                partition.getMasterTable().get( updatedEntryId ) );
 
             assertTrue( updated.contains( SN_AT, "test2", updatedEntryId.toString() ) );
             assertTrue( updated.contains( GN_AT, "test3" ) );



Mime
View raw message