You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2013/12/27 22:03:31 UTC

git commit: AMBARI-4191. NPE exceptions / errors in server log. (swagle)

Updated Branches:
  refs/heads/branch-1.4.3 5b18fcc98 -> 1cbb7d359


AMBARI-4191. NPE exceptions / errors in server log. (swagle)


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

Branch: refs/heads/branch-1.4.3
Commit: 1cbb7d359e597efb5b2bd4b731519e97fe8eda16
Parents: 5b18fcc
Author: Siddharth Wagle <sw...@hortonworks.com>
Authored: Fri Dec 27 12:56:21 2013 -0800
Committer: Siddharth Wagle <sw...@hortonworks.com>
Committed: Fri Dec 27 12:56:34 2013 -0800

----------------------------------------------------------------------
 .../src/main/java/org/apache/ambari/server/state/ServiceInfo.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/1cbb7d35/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceInfo.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceInfo.java
index e583a64..c45531f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceInfo.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceInfo.java
@@ -233,7 +233,7 @@ public class ServiceInfo {
     Set<String> keys = configLayout.get(type);
 
     for (String staleCheck : keyNames) {
-      if (keys.contains(staleCheck))
+      if (keys != null && keys.contains(staleCheck))
         return true;
     }