[infinispan-commits] Infinispan SVN: r2548 - in trunk/core/src: test/java/org/infinispan/tx/exception and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2010-10-21 09:35:39 -0400 (Thu, 21 Oct 2010)
New Revision: 2548

Modified:
   trunk/core/src/main/java/org/infinispan/transaction/xa/RemoteTransaction.java
   trunk/core/src/test/java/org/infinispan/tx/exception/ExplicitLockingAndTimeoutTest.java
Log:
fixed regressions

Modified: trunk/core/src/main/java/org/infinispan/transaction/xa/RemoteTransaction.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/transaction/xa/RemoteTransaction.java	2010-10-21 13:32:10 UTC (rev 2547)
+++ trunk/core/src/main/java/org/infinispan/transaction/xa/RemoteTransaction.java	2010-10-21 13:35:39 UTC (rev 2548)
@@ -9,6 +9,7 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
@@ -32,8 +33,8 @@
 
 
    public RemoteTransaction(WriteCommand[] modifications, GlobalTransaction tx) {
-      this.modifications = Arrays.asList(modifications);
-      lookedUpEntries = new BidirectionalLinkedHashMap<Object, CacheEntry>(modifications.length);
+      this.modifications = modifications == null || modifications.length == 0 ? Collections.<WriteCommand>emptyList(): Arrays.asList(modifications);
+      lookedUpEntries = new BidirectionalLinkedHashMap<Object, CacheEntry>(this.modifications.size());
       this.tx = tx;
    }
 

Modified: trunk/core/src/test/java/org/infinispan/tx/exception/ExplicitLockingAndTimeoutTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/tx/exception/ExplicitLockingAndTimeoutTest.java	2010-10-21 13:32:10 UTC (rev 2547)
+++ trunk/core/src/test/java/org/infinispan/tx/exception/ExplicitLockingAndTimeoutTest.java	2010-10-21 13:35:39 UTC (rev 2548)
@@ -92,7 +92,7 @@
       tm.rollback();
       assertEquals(0, txTable0.getLocalTxCount());
       assertEquals(1, txTable1.getLocalTxCount());
-      assertEquals(0, txTable1.getRemoteTxCount());
+      assertEquals(1, txTable1.getRemoteTxCount());
 
 
       tm.resume(k1LockOwner);