Repository: ambari Updated Branches: refs/heads/branch-1.7.0 295633ba8 -> 52468546c
Revert "AMBARI-7822. Events with Service Checks results in Exceptions in log. Null check." UT failures: https://builds.apache.org/job/Ambari-branch-1.7.0/123/ This reverts commit 7d86ffc97a5b2e8ca0fe031b2cab662b2558971c. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/60e79829 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/60e79829 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/60e79829 Branch: refs/heads/branch-1.7.0 Commit: 60e798297b509e8d857151710d1e1ac3bec80700 Parents: 295633b Author: Yusaku Sako <yus...@hortonworks.com> Authored: Fri Oct 17 07:57:18 2014 -0700 Committer: Yusaku Sako <yus...@hortonworks.com> Committed: Fri Oct 17 07:57:18 2014 -0700 ---------------------------------------------------------------------- .../server/controller/AmbariManagementControllerImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/60e79829/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java index 6779205..9b17352 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java @@ -1980,9 +1980,10 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle Service s = cluster.getService(serviceName); // find service component host ServiceComponent component = getClientComponentForRunningAction(cluster, s); - String componentName = component != null ? component.getName() : null; + String componentName = component.getName(); String clientHost = getClientHostForRunningAction(cluster, s, component); - String smokeTestRole = actionMetadata.getServiceCheckAction(serviceName); + String smokeTestRole = + actionMetadata.getServiceCheckAction(serviceName); if (clientHost == null || smokeTestRole == null) { LOG.info("Nothing to do for service check as could not find role or"
