[infinispan-commits] Infinispan SVN: r715 - in trunk/core/src: test/java/org/infinispan/distribution/rehash and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2009-08-20 22:10:33 -0400 (Thu, 20 Aug 2009)
New Revision: 715

Modified:
   trunk/core/src/main/java/org/infinispan/distribution/TransactionLoggerImpl.java
   trunk/core/src/test/java/org/infinispan/distribution/rehash/RehashLeaveTestBase.java
Log:
More dist tests

Modified: trunk/core/src/main/java/org/infinispan/distribution/TransactionLoggerImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/distribution/TransactionLoggerImpl.java	2009-08-21 01:52:39 UTC (rev 714)
+++ trunk/core/src/main/java/org/infinispan/distribution/TransactionLoggerImpl.java	2009-08-21 02:10:33 UTC (rev 715)
@@ -86,12 +86,13 @@
          try {
             if (enabled) {
                PrepareCommand pc = uncommittedPrepares.remove(command.getGlobalTransaction());
-               for (WriteCommand wc : pc.getModifications())
-                  try {
-                     commandQueue.put(wc);
-                  } catch (InterruptedException e) {
-                     Thread.currentThread().interrupt();
-                  }
+               // TODO how can we handle this efficiently and safely?
+//               for (WriteCommand wc : pc.getModifications())
+//                  try {
+//                     commandQueue.put(wc);
+//                  } catch (InterruptedException e) {
+//                     Thread.currentThread().interrupt();
+//                  }
             }
          } finally {
             loggingLock.readLock().unlock();

Modified: trunk/core/src/test/java/org/infinispan/distribution/rehash/RehashLeaveTestBase.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/distribution/rehash/RehashLeaveTestBase.java	2009-08-21 01:52:39 UTC (rev 714)
+++ trunk/core/src/test/java/org/infinispan/distribution/rehash/RehashLeaveTestBase.java	2009-08-21 02:10:33 UTC (rev 715)
@@ -10,7 +10,7 @@
 @Test(groups = "functional", testName = "distribution.rehash.RehashLeaveTestBase")
 public abstract class RehashLeaveTestBase extends RehashTestBase {
    void waitForRehashCompletion() {
-      long giveupTime = System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(60 * 5);
+      long giveupTime = System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(60 * 2);
 
 
       for (Cache c : caches) {