remm 01/10/03 19:48:34
Modified: src/share/org/apache/slide/transaction SlideTransaction.java
SlideTransactionManager.java
Log:
- Cleanup logging.
- Enlist / delist are now logged in the transaction.
- Begin / commit / rollback are logged in the transaction manager.
Revision Changes Path
1.14 +23 -18
jakarta-slide/src/share/org/apache/slide/transaction/SlideTransaction.java
Index: SlideTransaction.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/transaction/SlideTransaction.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- SlideTransaction.java 2001/10/03 20:48:41 1.13
+++ SlideTransaction.java 2001/10/04 02:48:34 1.14
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/transaction/SlideTransaction.java,v
1.13 2001/10/03 20:48:41 remm Exp $
- * $Revision: 1.13 $
- * $Date: 2001/10/03 20:48:41 $
+ * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/transaction/SlideTransaction.java,v
1.14 2001/10/04 02:48:34 remm Exp $
+ * $Revision: 1.14 $
+ * $Date: 2001/10/04 02:48:34 $
*
* ====================================================================
*
@@ -91,12 +91,12 @@
* JTA Transaction implementation.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Remy Maucherat</a>
- * @version $Revision: 1.13 $
+ * @version $Revision: 1.14 $
*/
public final class SlideTransaction implements Transaction {
- // ------------------------------------------------------------ Constructor
+ // -------------------------------------------------------------- Constants
protected static final String LOG_CHANNEL =
@@ -229,14 +229,6 @@
HeuristicRollbackException, SecurityException, IllegalStateException,
SystemException {
- if (transactionManager.getLogger().isEnabled
- (LOG_CHANNEL, Logger.DEBUG)) {
- String logMessage = Messages.format
- (SlideTransaction.class.getName() + ".commit", toString());
- transactionManager.getLogger().log
- (logMessage, LOG_CHANNEL, Logger.DEBUG);
- }
-
//System.out.println(this + " COMMIT ");
if (status == Status.STATUS_MARKED_ROLLBACK) {
@@ -398,6 +390,15 @@
activeBranches.remove(xaRes);
+ if (transactionManager.getLogger().isEnabled
+ (LOG_CHANNEL, Logger.DEBUG)) {
+ String logMessage = Messages.format
+ (SlideTransaction.class.getName() + ".delist", xaRes,
+ getXAFlag(flag), toString());
+ transactionManager.getLogger().log
+ (logMessage, LOG_CHANNEL, Logger.DEBUG);
+ }
+
XAException exception = null;
try {
@@ -487,6 +488,15 @@
enlistedResources.addElement(xaRes);
}
+ if (transactionManager.getLogger().isEnabled
+ (LOG_CHANNEL, Logger.DEBUG)) {
+ String logMessage = Messages.format
+ (SlideTransaction.class.getName() + ".enlist", xaRes,
+ getXAFlag(flag), toString());
+ transactionManager.getLogger().log
+ (logMessage, LOG_CHANNEL, Logger.DEBUG);
+ }
+
try {
//System.out.println("Starting(" + this + ") = " + xaRes + " Branch: " + branchXid
+ " Flag: " + flag);
@@ -528,11 +538,6 @@
// Check status ACTIVE
if (status != Status.STATUS_ACTIVE && status !=
Status.STATUS_MARKED_ROLLBACK)
throw new IllegalStateException();
-
- String logMessage = Messages.format
- (SlideTransaction.class.getName() + ".rollback", toString());
- transactionManager.getLogger().log
- (logMessage, LOG_CHANNEL, Logger.INFO);
Vector exceptions = new Vector();
1.5 +32 -4
jakarta-slide/src/share/org/apache/slide/transaction/SlideTransactionManager.java
Index: SlideTransactionManager.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/transaction/SlideTransactionManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SlideTransactionManager.java 2001/10/03 20:48:41 1.4
+++ SlideTransactionManager.java 2001/10/04 02:48:34 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/transaction/SlideTransactionManager.java,v
1.4 2001/10/03 20:48:41 remm Exp $
- * $Revision: 1.4 $
- * $Date: 2001/10/03 20:48:41 $
+ * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/transaction/SlideTransactionManager.java,v
1.5 2001/10/04 02:48:34 remm Exp $
+ * $Revision: 1.5 $
+ * $Date: 2001/10/04 02:48:34 $
*
* ====================================================================
*
@@ -92,7 +92,7 @@
* </ul>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Remy Maucherat</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public final class SlideTransactionManager implements TransactionManager {
@@ -100,6 +100,10 @@
// -------------------------------------------------------------- Constants
+ protected static final String LOG_CHANNEL =
+ SlideTransactionManager.class.getName();
+
+
public static final int DEFAULT_TRANSACTION_TIMEOUT = 30;
@@ -171,6 +175,13 @@
currentTransaction = new SlideTransaction(this);
bindings.put(Thread.currentThread(), currentTransaction);
+ if (logger.isEnabled(LOG_CHANNEL, Logger.DEBUG)) {
+ String logMessage = Messages.format
+ (SlideTransactionManager.class.getName() + ".begin",
+ currentTransaction.toString());
+ logger.log(logMessage, LOG_CHANNEL, Logger.DEBUG);
+ }
+
}
@@ -206,6 +217,13 @@
timeouts.remove(currentThread);
+ if (logger.isEnabled(LOG_CHANNEL, Logger.DEBUG)) {
+ String logMessage = Messages.format
+ (SlideTransactionManager.class.getName() + ".commit",
+ currentTransaction.toString());
+ logger.log(logMessage, LOG_CHANNEL, Logger.DEBUG);
+ }
+
currentTransaction.commit();
}
@@ -234,6 +252,11 @@
timeouts.remove(currentThread);
+ String logMessage = Messages.format
+ (SlideTransactionManager.class.getName() + ".rollback",
+ currentTransaction.toString());
+ logger.log(logMessage, LOG_CHANNEL, Logger.INFO);
+
currentTransaction.rollback();
}
@@ -255,6 +278,11 @@
Transaction currentTransaction = getTransaction();
if (currentTransaction == null)
throw new IllegalStateException();
+
+ String logMessage = Messages.format
+ (SlideTransactionManager.class.getName() + ".rollbackOnly",
+ currentTransaction.toString());
+ logger.log(logMessage, LOG_CHANNEL, Logger.INFO);
currentTransaction.setRollbackOnly();
