Repository: ambari Updated Branches: refs/heads/trunk 60db51efe -> 65e819318
AMBARI-5651 - Ambari Views : NPE deploying view with no instances defined Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/65e81931 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/65e81931 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/65e81931 Branch: refs/heads/trunk Commit: 65e8193187cf550071ecaaab228f4470dcb96bef Parents: 60db51e Author: tbeerbower <tbeerbo...@hortonworks.com> Authored: Thu May 1 16:34:37 2014 -0400 Committer: tbeerbower <tbeerbo...@hortonworks.com> Committed: Thu May 1 18:17:41 2014 -0400 ---------------------------------------------------------------------- .../java/org/apache/ambari/server/view/ViewRegistry.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/65e81931/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java index c8da1ae..a45cb39 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java @@ -58,6 +58,7 @@ import java.io.InputStream; import java.net.URL; import java.net.URLClassLoader; import java.util.Collection; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -170,7 +171,13 @@ public class ViewRegistry { * @return the collection of view instances for the view definition */ public Collection<ViewInstanceEntity> getInstanceDefinitions(ViewEntity definition) { - return definition == null ? null : viewInstanceDefinitions.get(definition).values(); + if (definition != null) { + Map<String, ViewInstanceEntity> instanceEntityMap = viewInstanceDefinitions.get(definition); + if (instanceEntityMap != null) { + return instanceEntityMap.values(); + } + } + return Collections.emptyList(); } /**
