svn commit: r1648889 - /hive/trunk/beeline/src/java/org/apache/hive/beeline/Commands.java

[brock]

Author: brock
Date: Thu Jan  1 17:01:25 2015
New Revision: 1648889

URL: http://svn.apache.org/r1648889
Log:
HIVE-9226 - Beeline interweaves the query result and query log sometimes (Dong 
Chen via Brock)

Modified:
    hive/trunk/beeline/src/java/org/apache/hive/beeline/Commands.java

Modified: hive/trunk/beeline/src/java/org/apache/hive/beeline/Commands.java
URL: 
http://svn.apache.org/viewvc/hive/trunk/beeline/src/java/org/apache/hive/beeline/Commands.java?rev=1648889&r1=1648888&r2=1648889&view=diff
==============================================================================
--- hive/trunk/beeline/src/java/org/apache/hive/beeline/Commands.java (original)
+++ hive/trunk/beeline/src/java/org/apache/hive/beeline/Commands.java Thu Jan  
1 17:01:25 2015
@@ -780,6 +780,7 @@ public class Commands {
             logThread.start();
             hasResults = stmnt.execute(sql);
             logThread.interrupt();
+            logThread.join(DEFAULT_QUERY_PROGRESS_THREAD_TIMEOUT);
           }
         }
 
@@ -847,6 +848,7 @@ public class Commands {
               return;
             } catch (InterruptedException e) {
               beeLine.debug("Getting log thread is interrupted, since query is 
done!");
+              showRemainingLogsIfAny(hiveStatement);
               return;
             }
           }