Added closeConnection property to ManagedTransactionFactory to avoid closing managed connections for some application servers.

Author: cbegin

doc/en/MyBatis-3-User-Guide.doc

@@ -12,9 +12,11 @@ public class ManagedTransaction implements Transaction {
   private static final Log log = LogFactory.getLog(ManagedTransaction.class);
 
   private Connection connection;
+  private boolean closeConnection;
 
-  public ManagedTransaction(Connection connection) {
+  public ManagedTransaction(Connection connection, boolean closeConnection) {
     this.connection = connection;
+    this.closeConnection = closeConnection;
   }
 
   public Connection getConnection() {
@@ -30,11 +32,13 @@ public void rollback() throws SQLException {
   }
 
   public void close() throws SQLException {
-    try {
-      if (connection != null) connection.close();
-    } catch (SQLException e) {
-      // Log and ignore.  Nothing more that should be done here.
-      log.error(e.getMessage(), e);
+    if (closeConnection) {
+      try {
+        if (connection != null) connection.close();
+      } catch (SQLException e) {
+        // Log and ignore.  Nothing more that should be done here.
+        log.error(e.getMessage(), e);
+      }
     }
   }
 

doc/en/MyBatis-3-User-Guide.pdf

@@ -8,13 +8,21 @@
 
 public class ManagedTransactionFactory implements TransactionFactory {
 
+  private boolean closeConnection = true;
+
   public void setProperties(Properties props) {
+    if (props != null) {
+      String closeConnectionProperty = props.getProperty("closeConnection");
+      if (closeConnectionProperty != null) {
+        closeConnection = Boolean.valueOf(closeConnectionProperty);
+      }
+    }
   }
 
   public Transaction newTransaction(Connection conn, boolean autoCommit) {
     // Silently ignores autocommit, as managed transactions are entirely
     // controlled by an external manager.  It's silently ignored so that
     // code remains portable between managed and unmanaged configurations.
-    return new ManagedTransaction(conn);
+    return new ManagedTransaction(conn, closeConnection);
   }
 }

src/main/java/org/apache/ibatis/transaction/managed/ManagedTransaction.java

@@ -40,4 +40,24 @@ public void shouldEnsureThatCallsToManagedTransactionAPIDoNotForwardToManagedCon
     mockery.assertIsSatisfied();
   }
 
+
+  @Test
+  public void shouldEnsureThatCallsToManagedTransactionAPIDoNotForwardToManagedConnectionsAndDoesNotCloseConnection() throws Exception {
+    mockery.checking(new Expectations() {
+      {
+      }
+    });
+
+    TransactionFactory tf = new ManagedTransactionFactory();
+    Properties props = new Properties();
+    props.setProperty("closeConnection","false");
+    tf.setProperties(props);
+    Transaction tx = tf.newTransaction(conn, false);
+    assertEquals(conn, tx.getConnection());
+    tx.commit();
+    tx.rollback();
+    tx.close();
+    mockery.assertIsSatisfied();
+  }
+
 }