fixed regressions

infinispan · Oct 21, 2010 · a43531e · a43531e
1 parent 661b0cf
commit a43531e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/core/src/main/java/org/infinispan/transaction/xa/RemoteTransaction.java b/core/src/main/java/org/infinispan/transaction/xa/RemoteTransaction.java
@@ -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 class RemoteTransaction implements CacheTransaction, Cloneable {
 
 
    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;
    }
 

diff --git a/core/src/test/java/org/infinispan/tx/exception/ExplicitLockingAndTimeoutTest.java b/core/src/test/java/org/infinispan/tx/exception/ExplicitLockingAndTimeoutTest.java
@@ -92,7 +92,7 @@ public void testExplicitLockingRemoteTimeout() throws NotSupportedException, Sys
       tm.rollback();
       assertEquals(0, txTable0.getLocalTxCount());
       assertEquals(1, txTable1.getLocalTxCount());
-      assertEquals(0, txTable1.getRemoteTxCount());
+      assertEquals(1, txTable1.getRemoteTxCount());
 
 
       tm.resume(k1LockOwner);