[incubator-iotdb] branch master updated: [IOTDB-681] Fix bugs caused by batch manner displaying query results in CLI

[qiaojialin]

This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 174a219  [IOTDB-681] Fix bugs caused by batch manner displaying query 
results in CLI
174a219 is described below

commit 174a219c25b3796c505d7aa8efe5b42db0b7428b
Author: samperson1997 <sz...@mails.tsinghua.edu.cn>
AuthorDate: Sat May 16 23:29:41 2020 +0800

    [IOTDB-681] Fix bugs caused by batch manner displaying query results in CLI
---
 cli/src/main/java/org/apache/iotdb/cli/AbstractCli.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cli/src/main/java/org/apache/iotdb/cli/AbstractCli.java 
b/cli/src/main/java/org/apache/iotdb/cli/AbstractCli.java
index 068b5be..b1b831d 100644
--- a/cli/src/main/java/org/apache/iotdb/cli/AbstractCli.java
+++ b/cli/src/main/java/org/apache/iotdb/cli/AbstractCli.java
@@ -564,11 +564,12 @@ public abstract class AbstractCli {
               e.printStackTrace();
             }
           }
-          resetArgs();
         }
       }
     } catch (Exception e) {
       println("Msg: " + e.getMessage());
+    } finally {
+      resetArgs();
     }
   }
 
@@ -606,8 +607,8 @@ public abstract class AbstractCli {
       }
     }
     int j = 0;
-    isReachEnd = !resultSet.next();
     if (cursorBeforeFirst) {
+      isReachEnd = !resultSet.next();
       cursorBeforeFirst = false;
     }
     if (resultSet instanceof IoTDBJDBCResultSet) {