Merge pull request #3089 from taosdata/master

Master

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
 

src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBStatement.java

@@ -158,7 +158,7 @@ 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);
+            this.connecter.freeResultSet(pSql);
             res = false;
         }