From ecdf1ce5ec799cf16079703195286a3589149352 Mon Sep 17 00:00:00 2001 From: zyyang Date: Thu, 13 Aug 2020 11:12:50 +0800 Subject: [PATCH 1/2] fix TD-1115 in master branch --- .../jdbc/src/main/java/com/taosdata/jdbc/TSDBStatement.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBStatement.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBStatement.java index 1cf024f30e..d72ba20783 100644 --- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBStatement.java +++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBStatement.java @@ -158,9 +158,10 @@ public class TSDBStatement implements Statement { throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL)); } else if (resultSetPointer == TSDBConstants.JNI_NULL_POINTER) { // no result set is retrieved + this.connecter.freeResultSet(pSql); res = false; } - this.connecter.freeResultSet(pSql); + return res; } From ff75c2cf118ac6824bdc503946c691ec7b072638 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Sun, 16 Aug 2020 15:39:31 +0000 Subject: [PATCH 2/2] TD-1124 --- packaging/cfg/taos.cfg | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packaging/cfg/taos.cfg b/packaging/cfg/taos.cfg index 5d33da5acc..93a6936da3 100644 --- a/packaging/cfg/taos.cfg +++ b/packaging/cfg/taos.cfg @@ -14,12 +14,9 @@ # local fully qualified domain name (FQDN) # fqdn hostname -# first port number for the connection (10 continuous UDP/TCP port number are used) +# first port number for the connection (12 continuous UDP/TCP port number are used) # serverPort 6030 -# http service port, default tcp [6041] -# httpPort 6041 - # log file's directory # logDir /var/log/taos