Author: cbegin
Date: Sun Dec 18 07:14:54 2005
New Revision: 357468
URL: http://svn.apache.org/viewcvs?rev=357468&view=rev
Log:
fixed IBATIS-228 Exception is thrown by TransactionManager when multiple
commits are issued against a started
Modified:
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/transaction/TransactionManager.java
Modified:
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/transaction/TransactionManager.java
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/transaction/TransactionManager.java?rev=357468&r1=357467&r2=357468&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/transaction/TransactionManager.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/transaction/TransactionManager.java
Sun Dec 18 07:14:54 2005
@@ -76,7 +76,7 @@
"A user provided connection is currently being used by this session.
" +
"You must call the commit() method of the Connection directly. " +
"The calling .setUserConnection (null) will clear the user provided
transaction.");
- } else if (state != TransactionState.STATE_STARTED) {
+ } else if (state != TransactionState.STATE_STARTED && state !=
TransactionState.STATE_COMMITTED ) {
throw new TransactionException("TransactionManager could not commit. No
transaction is started.");
}
if (session.isCommitRequired() || forceCommit) {
@@ -137,5 +137,4 @@
this.forceCommit = forceCommit;
}
-}
-
+}
\ No newline at end of file
