You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by re...@apache.org on 2001/11/04 06:58:13 UTC
cvs commit: jakarta-slide/src/share/org/apache/slide/transaction SlideTransaction.java
remm 01/11/03 21:58:13
Modified: src/share/org/apache/slide/transaction SlideTransaction.java
Log:
- Don't put the RM is the already enlisted list if the enlist fails (that solves
the NOTAs with Dirk test, although I still have a problem with it).
Revision Changes Path
1.17 +8 -8 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- SlideTransaction.java 2001/10/10 16:18:15 1.16
+++ SlideTransaction.java 2001/11/04 05:58:13 1.17
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/transaction/SlideTransaction.java,v 1.16 2001/10/10 16:18:15 juergen Exp $
- * $Revision: 1.16 $
- * $Date: 2001/10/10 16:18:15 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/transaction/SlideTransaction.java,v 1.17 2001/11/04 05:58:13 remm Exp $
+ * $Revision: 1.17 $
+ * $Date: 2001/11/04 05:58:13 $
*
* ====================================================================
*
@@ -93,7 +93,7 @@
* JTA Transaction implementation.
*
* @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
- * @version $Revision: 1.16 $
+ * @version $Revision: 1.17 $
*/
public final class SlideTransaction implements Transaction {
@@ -503,10 +503,6 @@
suspendedResources.remove(xaRes);
}
- if (!alreadyEnlisted) {
- enlistedResources.addElement(xaRes);
- }
-
if (transactionManager.getLogger().isEnabled
(LOG_CHANNEL, Logger.DEBUG)) {
String logMessage = Messages.format
@@ -527,6 +523,10 @@
transactionManager.getLogger().log
(logMessage, LOG_CHANNEL, Logger.WARNING);
return false;
+ }
+
+ if (!alreadyEnlisted) {
+ enlistedResources.addElement(xaRes);
}
branches.put(branchXid, xaRes);
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>