tidy OsgiManager passed in internal code
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/ed498fd0 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/ed498fd0 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/ed498fd0 Branch: refs/heads/master Commit: ed498fd06db921c403be261172ee00de1ef6ae90 Parents: 081212f Author: Alex Heneveld <alex.henev...@cloudsoftcorp.com> Authored: Fri Oct 27 10:23:53 2017 +0100 Committer: Alex Heneveld <alex.henev...@cloudsoftcorp.com> Committed: Fri Oct 27 10:23:53 2017 +0100 ---------------------------------------------------------------------- .../brooklyn/core/catalog/internal/BasicBrooklynCatalog.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ed498fd0/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 a79fec6..810ffc1 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 @@ -1440,7 +1440,7 @@ public class BasicBrooklynCatalog implements BrooklynCatalog { Maybe<OsgiManager> osgiManager = ((ManagementContextInternal)mgmt).getOsgiManager(); if (osgiManager.isPresent() && AUTO_WRAP_CATALOG_YAML_AS_BUNDLE) { // wrap in a bundle to be managed; need to get bundle and version from yaml - OsgiBundleInstallationResult result = addItemsOsgi(yaml, forceUpdate, osgiManager); + OsgiBundleInstallationResult result = addItemsOsgi(yaml, forceUpdate, osgiManager.get()); return toLegacyCatalogItems(result.getTypesInstalled()); // if all items pertaining to an older anonymous catalog.bom bundle have been overridden @@ -1457,7 +1457,7 @@ public class BasicBrooklynCatalog implements BrooklynCatalog { Maybe<OsgiManager> osgiManager = ((ManagementContextInternal)mgmt).getOsgiManager(); if (osgiManager.isPresent() && AUTO_WRAP_CATALOG_YAML_AS_BUNDLE) { // wrap in a bundle to be managed; need to get bundle and version from yaml - return addItemsOsgi(yaml, forceUpdate, osgiManager); + return addItemsOsgi(yaml, forceUpdate, osgiManager.get()); // if all items pertaining to an older anonymous catalog.bom bundle have been overridden // we delete those later; see list of wrapper bundles kept in OsgiManager @@ -1472,7 +1472,7 @@ public class BasicBrooklynCatalog implements BrooklynCatalog { return result; } - protected OsgiBundleInstallationResult addItemsOsgi(String yaml, boolean forceUpdate, Maybe<OsgiManager> osgiManager) { + protected OsgiBundleInstallationResult addItemsOsgi(String yaml, boolean forceUpdate, OsgiManager osgiManager) { Map<?, ?> cm = BasicBrooklynCatalog.getCatalogMetadata(yaml); if(cm == null) { @@ -1503,7 +1503,7 @@ public class BasicBrooklynCatalog implements BrooklynCatalog { OsgiBundleInstallationResult result = null; try { - result = osgiManager.get().install(new BasicManagedBundle(vn.getSymbolicName(), vn.getVersionString(), null), new FileInputStream(bf), true, true, forceUpdate).get(); + result = osgiManager.install(new BasicManagedBundle(vn.getSymbolicName(), vn.getVersionString(), null), new FileInputStream(bf), true, true, forceUpdate).get(); } catch (FileNotFoundException e) { throw Exceptions.propagate(e); } finally {