Repository: brooklyn-server Updated Branches: refs/heads/master b60d2b177 -> 1ae9aaa66
When adding a catlog item, throw an exception if there is no brooklyn.catalog in the YAML Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/1da2de97 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/1da2de97 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/1da2de97 Branch: refs/heads/master Commit: 1da2de97b1dfb6f56e43c20875bfec448c7749f0 Parents: b60d2b1 Author: graeme.miller <[email protected]> Authored: Fri Sep 29 16:36:14 2017 +0100 Committer: graeme.miller <[email protected]> Committed: Fri Sep 29 16:39:03 2017 +0100 ---------------------------------------------------------------------- .../brooklyn/core/catalog/internal/BasicBrooklynCatalog.java | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/1da2de97/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java index e935cfe..a9c6669 100644 --- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java +++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java @@ -1455,6 +1455,11 @@ public class BasicBrooklynCatalog implements BrooklynCatalog { protected OsgiBundleInstallationResult addItemsOsgi(String yaml, boolean forceUpdate, Maybe<OsgiManager> osgiManager) { Map<?, ?> cm = BasicBrooklynCatalog.getCatalogMetadata(yaml); + + if(cm == null) { + throw new IllegalStateException("No catalog meta data supplied. brooklyn.catalog must be specified"); + } + VersionedName vn = BasicBrooklynCatalog.getVersionedName( cm, false ); if (vn==null) { // for better legacy compatibiity, if id specified at root use that
