You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by li...@apache.org on 2009/01/09 15:37:44 UTC
svn commit: r733048 -
/geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionImpl.java
Author: linsun
Date: Fri Jan 9 06:37:43 2009
New Revision: 733048
URL: http://svn.apache.org/viewvc?rev=733048&view=rev
Log:
prevent one phase commit continue into 2 phase commit, should fix unit test in geronimo-connector
Modified:
geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionImpl.java
Modified: geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionImpl.java
URL: http://svn.apache.org/viewvc/geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionImpl.java?rev=733048&r1=733047&r2=733048&view=diff
==============================================================================
--- geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionImpl.java (original)
+++ geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionImpl.java Fri Jan 9 06:37:43 2009
@@ -302,8 +302,9 @@
if (resourceManagers.size() == 1) {
TransactionBranch manager = (TransactionBranch) resourceManagers.getFirst();
commitResource(manager);
- }
-
+ return;
+ }
+
boolean willCommit = false;
try {
// two-phase
@@ -313,7 +314,6 @@
throw e;
}
-
// notify the RMs
if (willCommit) {
commitResources(resourceManagers);
@@ -404,7 +404,6 @@
//helper method used by Transaction.commit and XATerminator prepare.
private boolean internalPrepare() throws SystemException {
-
for (Iterator rms = resourceManagers.iterator(); rms.hasNext();) {
synchronized (this) {
if (status != Status.STATUS_PREPARING) {