Jun0x01
diff --git a/Collapse file
‎src/main/java/org/sqlite/core/CoreResultSet.java‎
Copy file name to clipboardExpand all lines: src/main/java/org/sqlite/core/CoreResultSet.java
+7-6Lines changed: 7 additions & 6 deletions b/Collapse file
‎src/main/java/org/sqlite/core/CoreResultSet.java‎
Copy file name to clipboardExpand all lines: src/main/java/org/sqlite/core/CoreResultSet.java
+7-6Lines changed: 7 additions & 6 deletions
diff --git a/Collapse file
‎src/test/java/org/sqlite/ResultSetTest.java‎
Copy file name to clipboardExpand all lines: src/test/java/org/sqlite/ResultSetTest.java
+14Lines changed: 14 additions & 0 deletions b/Collapse file
‎src/test/java/org/sqlite/ResultSetTest.java‎
Copy file name to clipboardExpand all lines: src/test/java/org/sqlite/ResultSetTest.java
+14Lines changed: 14 additions & 0 deletions
@@ -120,19 +120,18 @@ public void close() throws SQLException {
         cols = null;
         colsMeta = null;
         meta = null;
-        open = false;
         limitRows = 0;
         row = 0;
         lastCol = -1;
         columnNameToIndex = null;
 
+        if (!open) {
+            return;
+        }
+
         DB db = stmt.getDatbase();
         synchronized (db) {
-            if (stmt == null) {
-                return;
-            }
-
-            if (stmt != null && stmt.pointer != 0) {
+            if (stmt.pointer != 0) {
                 db.reset(stmt.pointer);
 
                 if (closeStmt) {
@@ -141,6 +140,8 @@ public void close() throws SQLException {
                 }
             }
         }
+
+        open = false;
     }
 
     protected Integer findColumnIndexInCache(String col) {
 
@@ -140,4 +140,18 @@ public void testSelectWithTableNameNowNotFindWithTableName()
         resultSet.findColumn("test.id");
     }
 
+    @Test
+    public void testCloseStatement()
+        throws SQLException {
+        ResultSet resultSet = stat.executeQuery("select test.id from test");
+
+        stat.close();
+
+        assertTrue(stat.isClosed());
+        assertTrue(resultSet.isClosed());
+
+        resultSet.close();
+
+        assertTrue(resultSet.isClosed());
+    }
 }