svn commit: r1600952 - in /hive/trunk/ql/src: java/org/apache/hadoop/hive/ql/exec/tez/TezSessionPoolManager.java test/org/apache/hadoop/hive/ql/exec/tez/TestTezTask.java

[hashutosh]

Author: hashutosh
Date: Fri Jun  6 16:19:46 2014
New Revision: 1600952

URL: http://svn.apache.org/r1600952
Log:
HIVE-7135 : Fix test fail of TestTezTask.testSubmit (Navis via Ashutosh Chauhan)

Modified:
    
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionPoolManager.java
    hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestTezTask.java

Modified: 
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionPoolManager.java
URL: 
http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionPoolManager.java?rev=1600952&r1=1600951&r2=1600952&view=diff
==============================================================================
--- 
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionPoolManager.java
 (original)
+++ 
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionPoolManager.java
 Fri Jun  6 16:19:46 2014
@@ -271,7 +271,7 @@ public class TezSessionPoolManager {
   public void closeAndOpen(TezSessionState sessionState, HiveConf conf)
       throws Exception {
     HiveConf sessionConf = sessionState.getConf();
-    if (sessionConf.get("tez.queue.name") != null) {
+    if (sessionConf != null && sessionConf.get("tez.queue.name") != null) {
       conf.set("tez.queue.name", sessionConf.get("tez.queue.name"));
     }
     close(sessionState);

Modified: 
hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestTezTask.java
URL: 
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestTezTask.java?rev=1600952&r1=1600951&r2=1600952&view=diff
==============================================================================
--- hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestTezTask.java 
(original)
+++ hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestTezTask.java 
Fri Jun  6 16:19:46 2014
@@ -203,7 +203,7 @@ public class TestTezTask {
     task.submit(conf, dag, path, appLr, sessionState);
     // validate close/reopen
     verify(sessionState, times(1)).open(any(HiveConf.class));
-    verify(sessionState, times(1)).close(eq(true));
+    verify(sessionState, times(1)).close(eq(false));  // now uses pool after 
HIVE-7043
     verify(session, times(2)).submitDAG(any(DAG.class));
   }