[infinispan-commits] Infinispan SVN: r611 - trunk/core/src/main/java/org/infinispan/commands/tx.

[infinispan-commits at lists.jboss.org]

Author: mircea.markus
Date: 2009-07-23 09:05:47 -0400 (Thu, 23 Jul 2009)
New Revision: 611

Modified:
   trunk/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java
Log:
make sure the tx is removed from tx table when we have an 1pc tx.

Modified: trunk/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java	2009-07-23 11:40:03 UTC (rev 610)
+++ trunk/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java	2009-07-23 13:05:47 UTC (rev 611)
@@ -40,7 +40,7 @@
 import java.util.List;
 
 /**
- * // TODO: MANIK: Document this
+ * Command coresponding to the 1st phase of 2PC.
  *
  * @author Manik Surtani (<a href="mailto:manik at jboss.org">manik at jboss.org</a>)
  * @author Mircea.Markus at jboss.com
@@ -104,7 +104,13 @@
       if (trace)
          log.trace("Invoking remotly orginated prepare: " + this);
       notifier.notifyTransactionRegistered(ctx.getGlobalTransaction(), ctx);
-      return invoker.invoke(ctx, this);
+      try {
+         return invoker.invoke(ctx, this);
+      } finally {
+         if (this.isOnePhaseCommit()) {
+            txTable.removeRemoteTransaction(globalTx);
+         }
+      }
    }
 
    public Object acceptVisitor(InvocationContext ctx, Visitor visitor) throws Throwable {