Repository: hive
Updated Branches:
  refs/heads/master bda64ee87 -> 7fa8e37fd


HIVE-15992: LLAP: NPE in LlapTaskCommunicator.getCompletedLogsUrl for 
unsuccessful attempt (Rajesh Balamohan reviewed by Prasanth Jayachandran)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/7fa8e37f
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/7fa8e37f
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/7fa8e37f

Branch: refs/heads/master
Commit: 7fa8e37fd13d9d6a4a4a5b2c72ce02d7c2d199ef
Parents: bda64ee
Author: Prasanth Jayachandran <prasan...@apache.org>
Authored: Tue Feb 21 10:24:28 2017 -0800
Committer: Prasanth Jayachandran <prasan...@apache.org>
Committed: Tue Feb 21 10:24:28 2017 -0800

----------------------------------------------------------------------
 .../apache/hadoop/hive/llap/tezplugins/LlapTaskCommunicator.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/7fa8e37f/llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapTaskCommunicator.java
----------------------------------------------------------------------
diff --git 
a/llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapTaskCommunicator.java
 
b/llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapTaskCommunicator.java
index 893b7d9..3aae7a4 100644
--- 
a/llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapTaskCommunicator.java
+++ 
b/llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapTaskCommunicator.java
@@ -541,7 +541,7 @@ public class LlapTaskCommunicator extends 
TezTaskCommunicatorImpl {
   @Override
   public String getInProgressLogsUrl(TezTaskAttemptID attemptID, NodeId 
containerNodeId) {
     String url = "";
-    if (timelineServerUri != null) {
+    if (timelineServerUri != null && containerNodeId != null) {
       LlapNodeId llapNodeId = 
LlapNodeId.getInstance(containerNodeId.getHost(), containerNodeId.getPort());
       BiMap<ContainerId, TezTaskAttemptID> biMap = 
entityTracker.getContainerAttemptMapForNode(llapNodeId);
       ContainerId containerId = biMap.inverse().get(attemptID);
@@ -559,7 +559,7 @@ public class LlapTaskCommunicator extends 
TezTaskCommunicatorImpl {
   @Override
   public String getCompletedLogsUrl(TezTaskAttemptID attemptID, NodeId 
containerNodeId) {
     String url = "";
-    if (timelineServerUri != null) {
+    if (timelineServerUri != null && containerNodeId != null) {
       LlapNodeId llapNodeId = 
LlapNodeId.getInstance(containerNodeId.getHost(), containerNodeId.getPort());
       BiMap<ContainerId, TezTaskAttemptID> biMap = 
entityTracker.getContainerAttemptMapForNode(llapNodeId);
       ContainerId containerId = biMap.inverse().get(attemptID);

Reply via email to