From a0876eb776d2f91d41018bca558576c43d23e6e8 Mon Sep 17 00:00:00 2001
From: zyyang <zyyang@taosdata.com>
Date: Mon, 9 Nov 2020 16:52:42 +0800
Subject: [PATCH] [TD-1883]<fix>: fix memory leak when resultSet pointer is
 null

---
 src/connector/jdbc/deploy-pom.xml             |  2 +-
 .../com/taosdata/jdbc/TSDBJNIConnector.java   | 24 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/connector/jdbc/deploy-pom.xml b/src/connector/jdbc/deploy-pom.xml
index 3f6ebeff03..893290868d 100755
--- a/src/connector/jdbc/deploy-pom.xml
+++ b/src/connector/jdbc/deploy-pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>com.taosdata.jdbc</groupId>
   <artifactId>taos-jdbcdriver</artifactId>
-  <version>2.0.6</version>
+  <version>2.0.9</version>
   <packaging>jar</packaging>
 
   <name>JDBCDriver</name>
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java
index 0cd185de50..edc160e323 100755
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java
@@ -111,8 +111,8 @@ public class TSDBJNIConnector {
      * @throws SQLException
      */
     public long executeQuery(String sql) throws SQLException {
-    	// close previous result set if the user forgets to invoke the 
-    	// free method to close previous result set.
+        // close previous result set if the user forgets to invoke the
+        // free method to close previous result set.
         if (!this.isResultsetClosed) {
             freeResultSet(taosResultSetPointer);
         }
@@ -122,23 +122,23 @@ public class TSDBJNIConnector {
             pSql = this.executeQueryImp(sql.getBytes(TaosGlobalConfig.getCharset()), this.taos);
         } catch (Exception e) {
             e.printStackTrace();
-            this.freeResultSet(pSql);
+            this.freeResultSetImp(this.taos, pSql);
             throw new SQLException(TSDBConstants.WrapErrMsg("Unsupported encoding"));
         }
-        
+
         int code = this.getErrCode(pSql);
         if (code != 0) {
             affectedRows = -1;
             String msg = this.getErrMsg(pSql);
-            
-            this.freeResultSet(pSql);
+
+            this.freeResultSetImp(this.taos, pSql);
             throw new SQLException(TSDBConstants.WrapErrMsg(msg), "", code);
         }
 
         // Try retrieving result set for the executed SQL using the current connection pointer. 
         taosResultSetPointer = this.getResultSetImp(this.taos, pSql);
         isResultsetClosed = (taosResultSetPointer == TSDBConstants.JNI_NULL_POINTER);
-        
+
         return pSql;
     }
 
@@ -171,11 +171,11 @@ public class TSDBJNIConnector {
     }
 
     private native long getResultSetImp(long connection, long pSql);
-    
+
     public boolean isUpdateQuery(long pSql) {
-    	return isUpdateQueryImp(this.taos, pSql) == 1? true:false;
+        return isUpdateQueryImp(this.taos, pSql) == 1 ? true : false;
     }
-    
+
     private native long isUpdateQueryImp(long connection, long pSql);
 
     /**
@@ -191,7 +191,7 @@ public class TSDBJNIConnector {
             res = this.freeResultSetImp(this.taos, result);
             taosResultSetPointer = TSDBConstants.JNI_NULL_POINTER;
         }
-        
+
         isResultsetClosed = true;
         return res;
     }
@@ -274,7 +274,7 @@ public class TSDBJNIConnector {
      * Consume a subscription
      */
     long consume(long subscription) {
-       return this.consumeImp(subscription);
+        return this.consumeImp(subscription);
     }
 
     private native long consumeImp(long subscription);
-- 
GitLab