#65 - isClose() on IDLE connection throws SQLException - Flyway is using isClosed()

Author: rbygrave

ebean-datasource/src/main/java/io/ebean/datasource/pool/PooledConnection.java

@@ -524,6 +524,11 @@ public void setTransactionIsolation(int level) throws SQLException {
     }
   }
 
+  @Override
+  public boolean isClosed() throws SQLException {
+    return status == STATUS_IDLE ? true : connection.isClosed();
+  }
+
   //
   //
   // Simple wrapper methods which pass a method call onto the acutal
@@ -601,14 +606,6 @@ public SQLWarning getWarnings() throws SQLException {
     return connection.getWarnings();
   }
 
-  @Override
-  public boolean isClosed() throws SQLException {
-    if (status == STATUS_IDLE) {
-      throw new SQLException(IDLE_CONNECTION_ACCESSED_ERROR + "isClosed()");
-    }
-    return connection.isClosed();
-  }
-
   @Override
   public boolean isReadOnly() throws SQLException {
     if (status == STATUS_IDLE) {

ebean-datasource/src/test/java/io/ebean/datasource/pool/ConnectionPoolTest.java

@@ -11,7 +11,7 @@
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
-public class ConnectionPoolTest {
+class ConnectionPoolTest {
 
   private ConnectionPool pool;
 
@@ -20,7 +20,6 @@ public class ConnectionPoolTest {
   }
 
   private ConnectionPool createPool() {
-
     DataSourceConfig config = new DataSourceConfig();
     config.setUrl("jdbc:h2:mem:tests");
     config.setUsername("sa");
@@ -32,13 +31,12 @@ private ConnectionPool createPool() {
   }
 
   @AfterEach
-  public void after() {
+  void after() {
     pool.shutdown();
   }
 
   @Test
-  public void getConnection_expect_poolGrowsAboveMin() throws SQLException {
-
+  void getConnection_expect_poolGrowsAboveMin() throws SQLException {
     Connection con1 = pool.getConnection();
     Connection con2 = pool.getConnection();
 
@@ -68,8 +66,7 @@ public void getConnection_expect_poolGrowsAboveMin() throws SQLException {
   }
 
   @Test
-  public void getConnection_explicitUserPassword() throws SQLException {
-
+  void getConnection_explicitUserPassword() throws SQLException {
     Connection connection = pool.getConnection("sa", "");
     PreparedStatement statement = connection.prepareStatement("create user testing password '123'");
     statement.execute();
@@ -81,8 +78,7 @@ public void getConnection_explicitUserPassword() throws SQLException {
   }
 
   @Test
-  public void unwrapConnection() throws SQLException {
-
+  void unwrapConnection() throws SQLException {
     Connection connection = pool.getConnection();
     Connection underlying = connection.unwrap(Connection.class);
 
@@ -91,8 +87,7 @@ public void unwrapConnection() throws SQLException {
   }
 
   @Test
-  public void getDelegate() throws SQLException {
-
+  void getDelegate() throws SQLException {
     Connection connection = pool.getConnection();
     PooledConnection pc = (PooledConnection)connection;
     Connection underlying = pc.delegate();
@@ -102,7 +97,16 @@ public void getDelegate() throws SQLException {
   }
 
   @Test
-  public void testSchemaSwitch() throws SQLException {
+  void isClosed_afterClose() throws SQLException {
+    Connection connection = pool.getConnection();
+    assertThat(connection.isClosed()).isFalse();
+
+    connection.close();
+    assertThat(connection.isClosed()).isTrue();
+  }
+
+  @Test
+  void testSchemaSwitch() throws SQLException {
     Connection conn = pool.getConnection();
     Statement stmt = conn.createStatement();
     stmt.executeUpdate("CREATE SCHEMA TENANT_1");