[Mulgara-svn] r1011 - branches/mgr-121-lockrecovery/src/jar/resolver/java/org/mulgara/resolver

[ronald at mulgara.org]

Author: ronald
Date: 2008-06-22 19:38:52 -0700 (Sun, 22 Jun 2008)
New Revision: 1011

Modified:
   branches/mgr-121-lockrecovery/src/jar/resolver/java/org/mulgara/resolver/MulgaraInternalTransaction.java
Log:
A couple small fixes:
 * failure to resume should throw an exception
 * fully clean up on explicitRollback


Modified: branches/mgr-121-lockrecovery/src/jar/resolver/java/org/mulgara/resolver/MulgaraInternalTransaction.java
===================================================================
--- branches/mgr-121-lockrecovery/src/jar/resolver/java/org/mulgara/resolver/MulgaraInternalTransaction.java	2008-06-23 02:37:02 UTC (rev 1010)
+++ branches/mgr-121-lockrecovery/src/jar/resolver/java/org/mulgara/resolver/MulgaraInternalTransaction.java	2008-06-23 02:38:52 UTC (rev 1011)
@@ -352,7 +352,7 @@
         currentThread = Thread.currentThread();
       }
     } catch (Throwable th) {
-      abortTransaction("Failed to resume transaction", th);
+      throw abortTransaction("Failed to resume transaction", th);
     }
   }
 
@@ -430,6 +430,8 @@
           context.clear();
           enlisted.clear();
           factory.transactionComplete(this);
+          transaction = null;
+          factory = null;
           state = State.FINISHED;
           break;
         case DEACTREF: