diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionPoolManager.java ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionPoolManager.java index 041639d..0d0ac41 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionPoolManager.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionPoolManager.java @@ -271,7 +271,7 @@ public TezSessionState getSession(TezSessionState session, HiveConf conf, 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); diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestTezTask.java ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestTezTask.java index 1af92cf..3d55a7c 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestTezTask.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestTezTask.java @@ -203,7 +203,7 @@ public void testSubmit() throws Exception { 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)); }