You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2014/07/09 23:46:28 UTC
[15/50] git commit: fix NPE
fix NPE
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/f3f93b79
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/f3f93b79
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/f3f93b79
Branch: refs/heads/master
Commit: f3f93b79881aa576af935f2a83bb6d7cf84fbaac
Parents: 37d2004
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Sat Jul 5 05:09:02 2014 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Jul 9 22:34:43 2014 +0100
----------------------------------------------------------------------
.../main/java/brooklyn/catalog/internal/BasicBrooklynCatalog.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f3f93b79/core/src/main/java/brooklyn/catalog/internal/BasicBrooklynCatalog.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/catalog/internal/BasicBrooklynCatalog.java b/core/src/main/java/brooklyn/catalog/internal/BasicBrooklynCatalog.java
index 59d60da..0d45cc8 100644
--- a/core/src/main/java/brooklyn/catalog/internal/BasicBrooklynCatalog.java
+++ b/core/src/main/java/brooklyn/catalog/internal/BasicBrooklynCatalog.java
@@ -104,6 +104,7 @@ public class BasicBrooklynCatalog implements BrooklynCatalog {
public <T,SpecT> CatalogItem<T,SpecT> getCatalogItem(Class<T> type, String id) {
if (id==null) return null;
CatalogItem<?,?> result = getCatalogItem(id);
+ if (result==null) return null;
if (type==null || type.isAssignableFrom(result.getCatalogItemJavaType()))
return (CatalogItem<T,SpecT>)result;
return null;