Repository: ambari Updated Branches: refs/heads/trunk b0887b3fe -> 52f70fd7e
AMBARI-8069 - Views: 400 error on redeploy (tbeerbower) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/52f70fd7 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/52f70fd7 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/52f70fd7 Branch: refs/heads/trunk Commit: 52f70fd7eeada3c83dfcd4255115195dc37ccaf2 Parents: b0887b3 Author: tbeerbower <[email protected]> Authored: Fri Oct 31 15:59:27 2014 -0400 Committer: tbeerbower <[email protected]> Committed: Fri Oct 31 16:12:10 2014 -0400 ---------------------------------------------------------------------- .../api/resources/ResourceInstanceFactoryImpl.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/52f70fd7/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java index 60f7d87..f5de481 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java @@ -19,6 +19,7 @@ package org.apache.ambari.server.api.resources; +import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.Set; @@ -222,10 +223,12 @@ public class ResourceInstanceFactoryImpl implements ResourceInstanceFactory { break; case ViewInstance: - Set<SubResourceDefinition> subResourceDefinitions = - ViewRegistry.getInstance().getSubResourceDefinitions( - mapIds.get(Resource.Type.View), - mapIds.get(Resource.Type.ViewVersion)); + String viewName = mapIds.get(Resource.Type.View); + String version = mapIds.get(Resource.Type.ViewVersion); + + Set<SubResourceDefinition> subResourceDefinitions = (viewName == null || version == null) ? + Collections.<SubResourceDefinition>emptySet() : + ViewRegistry.getInstance().getSubResourceDefinitions(viewName, version); resourceDefinition = new ViewInstanceResourceDefinition(subResourceDefinitions); break;
