Merge pull request #542 from SmiNatalia/patch-1

Bad connection issue if autoCommit = false
mybatis · Apr 14, 2016 · 0f01892 · 0f01892
2 parents dca09fb + dcfa458
commit 0f01892
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/org/apache/ibatis/datasource/pooled/PooledDataSource.java b/src/main/java/org/apache/ibatis/datasource/pooled/PooledDataSource.java
@@ -397,7 +397,11 @@ private PooledConnection popConnection(String username, String password) throws
               state.accumulatedCheckoutTime += longestCheckoutTime;
               state.activeConnections.remove(oldestActiveConnection);
               if (!oldestActiveConnection.getRealConnection().getAutoCommit()) {
-                oldestActiveConnection.getRealConnection().rollback();
+                try {
+                  oldestActiveConnection.getRealConnection().rollback();
+                } catch (SQLException e) {
+                  log.debug("Bad connection. Could not roll back");
+                }  
               }
               conn = new PooledConnection(oldestActiveConnection.getRealConnection(), this);
               oldestActiveConnection.invalidate();