Updated Branches: refs/heads/trunk 6e556012c -> 02595a0fd
AMBARI-3779. During cluster install cannot go past Step0. (tbeerbower via yusaku) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/02595a0f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/02595a0f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/02595a0f Branch: refs/heads/trunk Commit: 02595a0fd9c2f15adb2dac4946639a96c5acdf95 Parents: 6e55601 Author: Yusaku Sako <yus...@hortonworks.com> Authored: Sat Nov 16 18:36:25 2013 -0800 Committer: Yusaku Sako <yus...@hortonworks.com> Committed: Sat Nov 16 18:36:25 2013 -0800 ---------------------------------------------------------------------- .../server/controller/internal/StackResourceProvider.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/02595a0f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackResourceProvider.java index 9321acf..b28abe8 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackResourceProvider.java @@ -51,8 +51,12 @@ public class StackResourceProvider extends ReadOnlyResourceProvider { final Set<StackRequest> requests = new HashSet<StackRequest>(); - for (Map<String, Object> propertyMap : getPropertyMaps(predicate)) { - requests.add(getRequest(propertyMap)); + if (predicate == null) { + requests.add(getRequest(Collections.<String, Object>emptyMap())); + } else { + for (Map<String, Object> propertyMap : getPropertyMaps(predicate)) { + requests.add(getRequest(propertyMap)); + } } Set<String> requestedIds = getRequestPropertyIds(request, predicate);
