ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject [1/2] git commit: Revert "AMBARI-7822. Events with Service Checks results in Exceptions in log. Null check."
Date Fri, 17 Oct 2014 14:51:54 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 42d2f14ac -> 1411d8e42


Revert "AMBARI-7822. Events with Service Checks results in Exceptions in log. Null check."

UT fails: https://builds.apache.org/view/All/job/Ambari-trunk-Commit/613/

This reverts commit 43ab9e61f076affb0a6fc92e39053cf0e8b6d163.


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

Branch: refs/heads/trunk
Commit: 4f09bd6b6162d561983f5aca1bec2bd9cfbd10b1
Parents: 42d2f14
Author: Yusaku Sako <yusaku@hortonworks.com>
Authored: Fri Oct 17 07:50:17 2014 -0700
Committer: Yusaku Sako <yusaku@hortonworks.com>
Committed: Fri Oct 17 07:50:17 2014 -0700

----------------------------------------------------------------------
 .../server/controller/AmbariManagementControllerImpl.java       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/4f09bd6b/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"


Mime
View raw message