[Mulgara-svn] r430 - branches/mgr-70/src/jar/resolver/java/org/mulgara/resolver

[andrae at mulgara.org]

Author: andrae
Date: 2007-09-12 00:57:17 -0500 (Wed, 12 Sep 2007)
New Revision: 430

Modified:
   branches/mgr-70/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransaction.java
Log:
Can't set currentThread to null except on suspend as due to rollbacks and aborts
we may still need to pass a concurrency check prior to finishing deactivate.



Modified: branches/mgr-70/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransaction.java
===================================================================
--- branches/mgr-70/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransaction.java	2007-09-12 05:17:42 UTC (rev 429)
+++ branches/mgr-70/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransaction.java	2007-09-12 05:57:17 UTC (rev 430)
@@ -394,11 +394,9 @@
         manager.transactionComplete(this);
       } finally { try {
         manager = null;
-      } finally { try {
-        currentThread = null;
       } finally {
         report("Committed transaction");
-      } } } } } } }
+      } } } } } }
     } catch (Throwable th) {
       errorReport("Error cleaning up transaction post-commit", th);
       throw new MulgaraTransactionException("Error cleaning up transaction post-commit", th);
@@ -486,7 +484,6 @@
             state = State.FAILED;
             manager.transactionComplete(this);
             manager = null;
-            currentThread = null;
             return new MulgaraTransactionException("Transaction rollback triggered", cause);
         case DEACTREF:
           throw new IllegalStateException("Attempt to rollback deactivated transaction");
@@ -545,11 +542,9 @@
         transaction = null;
       } finally { try {
         manager = null;
-      } finally { try {
-        state = State.FAILED;
       } finally {
-        currentThread = null;
-      } } } } } } } } }
+        state = State.FAILED;
+      } } } } } } } }
       return new MulgaraTransactionException(errorMessage + " - Aborting", cause);
     } catch (Throwable th) {
       throw new MulgaraTransactionException(errorMessage + " - Failed to abort cleanly", th);