Repository: brooklyn-server Updated Branches: refs/heads/master df83d44c0 -> b1baef3c8
limit reset/persistence to legacy items following change in https://github.com/apache/brooklyn-server/pull/814, legacy compatibility caused persistence of registered types from bundles, unnecessarily (and error-prone on rebind where it expects a real CatalogItemDto) Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/464d1d86 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/464d1d86 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/464d1d86 Branch: refs/heads/master Commit: 464d1d867d9d0d0b494c4fd8303b393b38417f91 Parents: 3ac961d Author: Alex Heneveld <[email protected]> Authored: Fri Sep 22 13:39:13 2017 +0100 Committer: Alex Heneveld <[email protected]> Committed: Fri Sep 22 13:39:13 2017 +0100 ---------------------------------------------------------------------- .../brooklyn/core/catalog/internal/BasicBrooklynCatalog.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/464d1d86/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 d170970..0fc4406 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 @@ -194,7 +194,7 @@ public class BasicBrooklynCatalog implements BrooklynCatalog { public void reset(CatalogDto dto, boolean failOnLoadError) { specCache.invalidate(); // Unregister all existing persisted items. - for (CatalogItem<?, ?> toRemove : getCatalogItems()) { + for (CatalogItem<?, ?> toRemove : getCatalogItemsLegacy()) { if (log.isTraceEnabled()) { log.trace("Scheduling item for persistence removal: {}", toRemove.getId()); } @@ -209,7 +209,7 @@ public class BasicBrooklynCatalog implements BrooklynCatalog { this.manualAdditionsCatalog = null; // Inject management context into and persist all the new entries. - for (CatalogItem<?, ?> entry : getCatalogItems()) { + for (CatalogItem<?, ?> entry : getCatalogItemsLegacy()) { boolean setManagementContext = false; if (entry instanceof CatalogItemDo) { CatalogItemDo<?, ?> cid = CatalogItemDo.class.cast(entry);
