Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3DEF217DB5 for ; Fri, 17 Oct 2014 14:51:55 +0000 (UTC) Received: (qmail 2136 invoked by uid 500); 17 Oct 2014 14:51:55 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 2108 invoked by uid 500); 17 Oct 2014 14:51:54 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 2096 invoked by uid 99); 17 Oct 2014 14:51:54 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Oct 2014 14:51:54 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 75F99939B5F; Fri, 17 Oct 2014 14:51:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yusaku@apache.org To: commits@ambari.apache.org Date: Fri, 17 Oct 2014 14:51:54 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: Revert "AMBARI-7822. Events with Service Checks results in Exceptions in log. Null check." 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 Authored: Fri Oct 17 07:50:17 2014 -0700 Committer: Yusaku Sako 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"