X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.enterprise%2Fsrc%2Forg%2Fargeo%2Ftransaction%2Fsimple%2FSimpleTransactionManager.java;h=7dcf7d99a43721182fe9df76f277105b40f2c216;hb=438237c2b8c995d4f9562d53bfe4ea63c4442054;hp=fef7281462f5ed2bb854ab1a1abccc8314854fa1;hpb=9885228c89ca6da1835c1c3e098c92589d76301e;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.enterprise/src/org/argeo/transaction/simple/SimpleTransactionManager.java b/org.argeo.enterprise/src/org/argeo/transaction/simple/SimpleTransactionManager.java index fef728146..7dcf7d99a 100644 --- a/org.argeo.enterprise/src/org/argeo/transaction/simple/SimpleTransactionManager.java +++ b/org.argeo.enterprise/src/org/argeo/transaction/simple/SimpleTransactionManager.java @@ -18,12 +18,11 @@ import javax.transaction.TransactionSynchronizationRegistry; import javax.transaction.UserTransaction; import javax.transaction.xa.Xid; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - +/** + * Simple implementation of an XA {@link TransactionManager} and + * {@link UserTransaction}. + */ public class SimpleTransactionManager implements TransactionManager, UserTransaction { - private final static Log log = LogFactory.getLog(SimpleTransactionManager.class); - private ThreadLocal current = new ThreadLocal(); private Map knownTransactions = Collections @@ -37,8 +36,6 @@ public class SimpleTransactionManager implements TransactionManager, UserTransac SimpleTransaction transaction = new SimpleTransaction(this); knownTransactions.put(transaction.getXid(), transaction); current.set(transaction); - if (log.isTraceEnabled()) - log.trace("STARTED " + transaction.getXid()); } @Override @@ -123,7 +120,7 @@ public class SimpleTransactionManager implements TransactionManager, UserTransac return null; return getCurrent().getXid(); } catch (SystemException e) { - throw new SimpleTransactionException("Cannot get transaction key", e); + throw new IllegalStateException("Cannot get transaction key", e); } } @@ -147,7 +144,7 @@ public class SimpleTransactionManager implements TransactionManager, UserTransac try { return getStatus(); } catch (SystemException e) { - throw new SimpleTransactionException("Cannot get status", e); + throw new IllegalStateException("Cannot get status", e); } } @@ -156,7 +153,7 @@ public class SimpleTransactionManager implements TransactionManager, UserTransac try { return getStatus() == Status.STATUS_MARKED_ROLLBACK; } catch (SystemException e) { - throw new SimpleTransactionException("Cannot get status", e); + throw new IllegalStateException("Cannot get status", e); } } @@ -165,7 +162,7 @@ public class SimpleTransactionManager implements TransactionManager, UserTransac try { getCurrent().setRollbackOnly(); } catch (Exception e) { - throw new SimpleTransactionException("Cannot set rollback only", e); + throw new IllegalStateException("Cannot set rollback only", e); } }