This closes #658
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/7aa53e0b Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/7aa53e0b Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/7aa53e0b Branch: refs/heads/master Commit: 7aa53e0bf57e076fdf6f32d80adc87f5fd809086 Parents: e3cfef7 8a81071 Author: Sam Corbett <[email protected]> Authored: Wed May 27 09:51:23 2015 +0100 Committer: Sam Corbett <[email protected]> Committed: Wed May 27 09:51:23 2015 +0100 ---------------------------------------------------------------------- .../catalog/internal/BasicBrooklynCatalog.java | 6 +- .../brooklyn/catalog/internal/CatalogDo.java | 38 ++-- .../main/java/brooklyn/rest/api/CatalogApi.java | 5 +- .../rest/resources/CatalogResource.java | 4 +- .../src/main/resources/not-a-jar-file.txt | 18 ++ .../src/main/resources/reset-catalog.xml | 37 ++++ .../rest/resources/CatalogResetTest.java | 180 +++++++++++++++++++ .../rest/resources/CatalogResourceTest.java | 39 ++++ 8 files changed, 311 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7aa53e0b/core/src/main/java/brooklyn/catalog/internal/BasicBrooklynCatalog.java ---------------------------------------------------------------------- diff --cc core/src/main/java/brooklyn/catalog/internal/BasicBrooklynCatalog.java index 7e4763d,15f4026..1b0bc9c --- a/core/src/main/java/brooklyn/catalog/internal/BasicBrooklynCatalog.java +++ b/core/src/main/java/brooklyn/catalog/internal/BasicBrooklynCatalog.java @@@ -141,11 -141,9 +145,11 @@@ public class BasicBrooklynCatalog imple } CatalogDo catalog = new CatalogDo(mgmt, dto); CatalogUtils.logDebugOrTraceIfRebinding(log, "Resetting "+this+" catalog to "+dto); - catalog.load(mgmt, null); + catalog.load(mgmt, null, failOnLoadError); CatalogUtils.logDebugOrTraceIfRebinding(log, "Reloaded catalog for "+this+", now switching"); this.catalog = catalog; + resetRootClassLoader(); + this.manualAdditionsCatalog = null; // Inject management context into and persist all the new entries. for (CatalogItem<?, ?> entry : getCatalogItems()) { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7aa53e0b/core/src/main/java/brooklyn/catalog/internal/CatalogDo.java ----------------------------------------------------------------------
