[CONJ-237] correction on closing an already closed prepareStatement

mariadb-corporation · Dec 26, 2015 · 4a949d2 · 4a949d2
1 parent 3da9340
commit 4a949d2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/main/java/org/mariadb/jdbc/MariaDbServerPreparedStatement.java b/src/main/java/org/mariadb/jdbc/MariaDbServerPreparedStatement.java
@@ -404,7 +404,7 @@ public void close() throws SQLException {
         // immediately garbage collected
         cachedResultSets.clear();
 
-        if (protocol.isConnected()) {
+        if (protocol != null && protocol.isConnected()) {
             try {
                 protocol.releasePrepareStatement(sql, prepareResult.statementId);
             } catch (QueryException e) {

diff --git a/src/test/java/org/mariadb/jdbc/PreparedStatementTest.java b/src/test/java/org/mariadb/jdbc/PreparedStatementTest.java
@@ -32,6 +32,14 @@ public static void initClass() throws SQLException {
                  "ENGINE=InnoDB DEFAULT CHARSET=utf8");
     }
 
+    @Test
+    public void testClosingError() throws Exception {
+        PreparedStatement preparedStatement = sharedConnection.prepareStatement("SELECT ?");
+        preparedStatement.close();
+        preparedStatement.close();
+
+    }
+
     /**
      * Conj-90.
      *