[Mulgara-svn] r1352 - trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi

[ronald at mulgara.org]

Author: ronald
Date: 2008-10-23 06:12:05 -0700 (Thu, 23 Oct 2008)
New Revision: 1352

Modified:
   trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/AbstractXAResource.java
Log:
Minor restructuring of if and try blocks.

Modified: trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/AbstractXAResource.java
===================================================================
--- trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/AbstractXAResource.java	2008-10-23 13:11:59 UTC (rev 1351)
+++ trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/AbstractXAResource.java	2008-10-23 13:12:05 UTC (rev 1352)
@@ -182,18 +182,18 @@
 
     T tx = getTxn(xid, "commit");
 
-    try {
-      if (onePhase) {
+    if (onePhase) {
+      try {
         int sts = doPrepare(tx);
         if (sts == XA_RDONLY) {
           transactionCompleted(tx);
           return;
         }
+      } catch (Throwable th) {
+        logger.error("Attempt to prepare in onePhaseCommit failed.", th);
+        rollback(xid);
+        throw (XAException)new XAException(XAException.XA_RBROLLBACK).initCause(th);
       }
-    } catch (Throwable th) {
-      logger.error("Attempt to prepare in onePhaseCommit failed.", th);
-      rollback(xid);
-      throw new XAException(XAException.XA_RBROLLBACK);
     }
 
     boolean clean = true;