[Mulgara-svn] r530 - branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver

[pag at mulgara.org]

Author: pag
Date: 2007-11-09 15:39:34 -0600 (Fri, 09 Nov 2007)
New Revision: 530

Modified:
   branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransaction.java
   branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionManager.java
Log:
Cleaned up some formatting, and removed unused imports

Modified: branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransaction.java
===================================================================
--- branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransaction.java	2007-11-09 21:30:02 UTC (rev 529)
+++ branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransaction.java	2007-11-09 21:39:34 UTC (rev 530)
@@ -19,10 +19,7 @@
 // Java 2 enterprise packages
 import java.util.HashSet;
 import java.util.Set;
-import javax.transaction.RollbackException;
-import javax.transaction.SystemException;
 import javax.transaction.Transaction;
-import javax.transaction.xa.XAResource;
 
 // Third party packages
 import org.apache.log4j.Logger;
@@ -34,7 +31,6 @@
 
 import org.mulgara.query.MulgaraTransactionException;
 import org.mulgara.query.TuplesException;
-import org.mulgara.query.QueryException;
 
 /**
  * Responsible for the javax.transaction.Transaction object.
@@ -465,11 +461,8 @@
           throw new MulgaraTransactionException("Unknown state");
       }
     } catch (Throwable th) {
-      try {
-        errorReport("Attempt to rollback failed; initiating cause: ", cause);
-      } finally {
-        throw abortTransaction("Failed to rollback normally - see log for inititing cause", th);
-      }
+      errorReport("Attempt to rollback failed; initiating cause: ", cause);
+      throw abortTransaction("Failed to rollback normally - see log for inititing cause", th);
     } finally {
       report("Leaving implicitRollback");
     }

Modified: branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionManager.java
===================================================================
--- branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionManager.java	2007-11-09 21:30:02 UTC (rev 529)
+++ branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionManager.java	2007-11-09 21:39:34 UTC (rev 530)
@@ -20,7 +20,6 @@
 // Java2 packages
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.locks.Condition;
@@ -28,7 +27,6 @@
 import javax.transaction.SystemException;
 import javax.transaction.Transaction;
 import javax.transaction.TransactionManager;
-import javax.transaction.xa.XAResource;
 
 // Third party packages
 import org.apache.log4j.Logger;
@@ -328,8 +326,6 @@
           error = th;
         }
 
-        final Throwable trigger = new MulgaraTransactionException("trigger rollback");
-
         if (transactions.containsKey(session)) {
           for (MulgaraTransaction transaction : transactions.get(session)) {
             try {