Author: psteitz
Date: Sun Jul 30 14:09:26 2006
New Revision: 426942
URL: http://svn.apache.org/viewvc?rev=426942&view=rev
Log:
Completed fix for DBCP-102.
Modified:
jakarta/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolableConnectionFactory.java
Modified:
jakarta/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolableConnectionFactory.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolableConnectionFactory.java?rev=426942&r1=426941&r2=426942&view=diff
==============================================================================
---
jakarta/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolableConnectionFactory.java
(original)
+++
jakarta/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolableConnectionFactory.java
Sun Jul 30 14:09:26 2006
@@ -355,7 +355,9 @@
conn.rollback();
}
conn.clearWarnings();
- conn.setAutoCommit(true);
+ if(!conn.getAutoCommit()) {
+ conn.setAutoCommit(true);
+ }
}
if(obj instanceof DelegatingConnection) {
((DelegatingConnection)obj).passivate();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
