SLIDER-1125 fix & typo
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/39e76023 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/39e76023 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/39e76023 Branch: refs/heads/feature/SLIDER-1107_AM_config_generation Commit: 39e760232bebc4fa33a134a8d166045bad1421e9 Parents: 55dd69d Author: Billie Rinaldi <billie.rina...@gmail.com> Authored: Thu May 19 11:58:19 2016 -0700 Committer: Billie Rinaldi <billie.rina...@gmail.com> Committed: Thu May 19 11:58:19 2016 -0700 ---------------------------------------------------------------------- .../org/apache/slider/providers/agent/AgentProviderService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/39e76023/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java index d5fae19..f20757a 100644 --- a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java +++ b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java @@ -906,7 +906,7 @@ public class AgentProviderService extends AbstractProviderService implements role = amState.getOwnedContainer(containerId); role.ip = status.getIp(); } - if(status.getHostname() != null & !status.getHostname().isEmpty()){ + if(status.getHostname() != null && !status.getHostname().isEmpty()){ role = amState.getOwnedContainer(containerId); role.hostname = status.getHostname(); }
