AMBARI-20044. NullPointerException after server restart in case not all hosts 
were joined. (Sandor Magyari via swagle)

Change-Id: Ibd10ae08be016fb150c2ccf38aa6c97e7686ae5a


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/82d48aab
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/82d48aab
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/82d48aab

Branch: refs/heads/AMBARI-2.4.2.16
Commit: 82d48aab3b00f7b33380b9ee766c93554c52f92e
Parents: 4336cb0
Author: Siddharth Wagle <[email protected]>
Authored: Wed Feb 22 15:33:10 2017 -0800
Committer: Siddharth Wagle <[email protected]>
Committed: Wed Feb 22 15:33:10 2017 -0800

----------------------------------------------------------------------
 .../main/java/org/apache/ambari/server/topology/HostRequest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/82d48aab/ambari-server/src/main/java/org/apache/ambari/server/topology/HostRequest.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/topology/HostRequest.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/topology/HostRequest.java
index 2136b68..e5f5e05 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/topology/HostRequest.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/topology/HostRequest.java
@@ -299,7 +299,7 @@ public class HostRequest implements Comparable<HostRequest> 
{
     for (HostRoleCommand logicalTask : logicalTasks.values()) {
       // set host on command detail if it is set to null
       String commandDetail = logicalTask.getCommandDetail();
-      if (commandDetail != null && commandDetail.contains("null")) {
+      if (commandDetail != null && commandDetail.contains("null") && hostname 
!= null) {
         logicalTask.setCommandDetail(commandDetail.replace("null", hostname));
       }
       Long physicalTaskId = physicalTasks.get(logicalTask.getTaskId());

Reply via email to