ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tbeerbo...@apache.org
Subject ambari git commit: AMBARI-9456 - Add a 'Prepare Backups' Stage to Rolling Upgrade before ZooKeeper : fix null HostsType (tbeerbower)
Date Wed, 04 Feb 2015 13:50:04 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 354998beb -> 63fb625e7


AMBARI-9456 - Add a 'Prepare Backups' Stage to Rolling Upgrade before ZooKeeper : fix null
HostsType (tbeerbower)


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

Branch: refs/heads/trunk
Commit: 63fb625e700aa503673786354b00afabdb5d1290
Parents: 354998b
Author: tbeerbower <tbeerbower@hortonworks.com>
Authored: Wed Feb 4 08:49:48 2015 -0500
Committer: tbeerbower <tbeerbower@hortonworks.com>
Committed: Wed Feb 4 08:49:48 2015 -0500

----------------------------------------------------------------------
 .../ambari/server/state/stack/upgrade/ClusterGrouping.java       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/63fb625e/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ClusterGrouping.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ClusterGrouping.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ClusterGrouping.java
index 91d9960..6213de1 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ClusterGrouping.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ClusterGrouping.java
@@ -164,7 +164,9 @@ public class ClusterGrouping extends Grouping {
 
       HostsType hosts = ctx.getResolver().getMasterAndHosts(service, component);
 
-      if (null != hosts) {
+      if (null == hosts) {
+        return null;
+      } else {
         realHosts = new LinkedHashSet<String>(hosts.hosts);
       }
     }


Mime
View raw message