[Mulgara-svn] r1362 - trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed

[ronald at mulgara.org]

Author: ronald
Date: 2008-10-23 06:42:39 -0700 (Thu, 23 Oct 2008)
New Revision: 1362

Modified:
   trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/MultiXAResource.java
Log:
Handle RMFAIL and NOTA correctly in forget().

Modified: trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/MultiXAResource.java
===================================================================
--- trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/MultiXAResource.java	2008-10-23 13:13:06 UTC (rev 1361)
+++ trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/MultiXAResource.java	2008-10-23 13:42:39 UTC (rev 1362)
@@ -381,6 +381,13 @@
         r.forget(txInfo.xid);
         iter.remove();
       } catch (Throwable t) {
+        if (isCompleted(t)) {
+          logger.debug("transaction " + formatXid(txInfo.xid) + " was not active on resource '" +
+                       r + "'", t);
+          iter.remove();
+          continue;
+        }
+
         if (exc == null) {
           exc = t;
         } else {