Repository: ambari Updated Branches: refs/heads/branch-2.5 f1fa4ec6a -> e5f188dd7
AMBARI-20044. NullPointerException after server restart in case not all hosts were joined (magyari_sandor) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e5f188dd Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e5f188dd Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e5f188dd Branch: refs/heads/branch-2.5 Commit: e5f188dd776296b847e461ee8428a3b3c7608564 Parents: f1fa4ec Author: Sandor Magyari <[email protected]> Authored: Thu Feb 16 16:22:59 2017 +0100 Committer: Sandor Magyari <[email protected]> Committed: Fri Feb 17 17:36:56 2017 +0100 ---------------------------------------------------------------------- .../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/e5f188dd/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 a18999b..a6f677a 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 @@ -313,7 +313,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());
