Author: mircea.markus
Date: 2009-05-13 06:41:51 -0400 (Wed, 13 May 2009)
New Revision: 279
Modified:
trunk/core/src/main/java/org/infinispan/commands/tx/AbstractTransactionBoundaryCommand.java
trunk/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java
trunk/core/src/main/java/org/infinispan/transaction/xa/TransactionTable.java
trunk/tree/src/test/java/org/infinispan/api/tree/NodeReplicatedMoveTest.java
Log:
added logs and enabled tests
Modified: trunk/core/src/main/java/org/infinispan/commands/tx/AbstractTransactionBoundaryCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/tx/AbstractTransactionBoundaryCommand.java 2009-05-13 09:15:44 UTC (rev 278)
+++ trunk/core/src/main/java/org/infinispan/commands/tx/AbstractTransactionBoundaryCommand.java 2009-05-13 10:41:51 UTC (rev 279)
@@ -78,6 +78,7 @@
RemoteTxInvocationContext ctxt = icc.getRemoteTxInvocationContext();
ctxt.setRemoteTransaction(transaction);
try {
+ if (trace) log.trace("About to execute tx command :" + this);
return invoker.invoke(ctxt, this);
} finally {
txTable.removeRemoteTransaction(globalTx);
Modified: trunk/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java 2009-05-13 09:15:44 UTC (rev 278)
+++ trunk/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java 2009-05-13 10:41:51 UTC (rev 279)
@@ -30,6 +30,8 @@
import org.infinispan.notifications.cachelistener.CacheNotifier;
import org.infinispan.transaction.xa.GlobalTransaction;
import org.infinispan.transaction.xa.RemoteTransaction;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import java.util.Arrays;
import java.util.List;
@@ -43,6 +45,9 @@
*/
public class PrepareCommand extends AbstractTransactionBoundaryCommand {
+ private static Log log = LogFactory.getLog(PrepareCommand.class);
+ private boolean trace = log.isTraceEnabled();
+
public static final byte COMMAND_ID = 12;
protected WriteCommand[] modifications;
@@ -77,7 +82,8 @@
//2. then set it on the invocation context
RemoteTxInvocationContext ctx = icc.getRemoteTxInvocationContext();
ctx.setRemoteTransaction(remoteTransaction);
-
+
+ if (trace) log.trace("Invoking remotly orginated prepare: " + this);
notifier.notifyTransactionRegistered(ctx.getGlobalTransaction(), ctx);
return invoker.invoke(ctx, this);
}
Modified: trunk/core/src/main/java/org/infinispan/transaction/xa/TransactionTable.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/transaction/xa/TransactionTable.java 2009-05-13 09:15:44 UTC (rev 278)
+++ trunk/core/src/main/java/org/infinispan/transaction/xa/TransactionTable.java 2009-05-13 10:41:51 UTC (rev 279)
@@ -77,7 +77,7 @@
throw new IllegalStateException(message);
}
if (trace) {
- log.trace("Created and regostered tremote transaction " + remoteTransaction);
+ log.trace("Created and registered remote transaction " + remoteTransaction);
}
return remoteTransaction;
}
@@ -117,7 +117,11 @@
* if such an tx exists.
*/
public boolean removeRemoteTransaction(GlobalTransaction txId) {
- return remoteTransactions.remove(txId) != null;
+ boolean existed = remoteTransactions.remove(txId) != null;
+ if (trace) {
+ log.trace("Removed " + txId + " from transaction table. Returning " + existed);
+ }
+ return existed;
}
public int getRemoteTxCount() {
Modified: trunk/tree/src/test/java/org/infinispan/api/tree/NodeReplicatedMoveTest.java
===================================================================
--- trunk/tree/src/test/java/org/infinispan/api/tree/NodeReplicatedMoveTest.java 2009-05-13 09:15:44 UTC (rev 278)
+++ trunk/tree/src/test/java/org/infinispan/api/tree/NodeReplicatedMoveTest.java 2009-05-13 10:41:51 UTC (rev 279)
@@ -103,7 +103,6 @@
}
- @Test (enabled = false)
public void testReplTxRollback() throws Exception {
System.out.println(TreeStructureSupport.printTree(cache1, true));
Node<Object, Object> rootNode = cache1.getRoot();