Merge branch 'master' into persist-osgi-bundles conflict - minor api change passing managementContext
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/b157ff8b Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/b157ff8b Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/b157ff8b Branch: refs/heads/master Commit: b157ff8b19643e7242651c93e46230be698c660f Parents: 3097bb9 022fb2f Author: Alex Heneveld <[email protected]> Authored: Tue Apr 25 21:23:29 2017 +0100 Committer: Alex Heneveld <[email protected]> Committed: Tue Apr 25 21:23:29 2017 +0100 ---------------------------------------------------------------------- .../camp/brooklyn/ConfigParametersYamlTest.java | 67 ++++++++++++++++++++ .../mgmt/persist/BrooklynPersistenceUtils.java | 16 +++-- .../brooklyn/core/objs/BasicSpecParameter.java | 26 +++++++- 3 files changed, 104 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/b157ff8b/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/BrooklynPersistenceUtils.java ---------------------------------------------------------------------- diff --cc core/src/main/java/org/apache/brooklyn/core/mgmt/persist/BrooklynPersistenceUtils.java index b3e17c5,1219e10..0899ed1 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/BrooklynPersistenceUtils.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/BrooklynPersistenceUtils.java @@@ -107,10 -104,15 +107,14 @@@ public class BrooklynPersistenceUtils PersistenceObjectStore destinationObjectStore) { BrooklynMementoPersisterToObjectStore persister = new BrooklynMementoPersisterToObjectStore( destinationObjectStore, - ((ManagementContextInternal)managementContext).getBrooklynProperties(), - managementContext.getCatalogClassLoader()); + managementContext); - PersistenceExceptionHandler exceptionHandler = PersistenceExceptionHandlerImpl.builder().build(); - persister.enableWriteAccess(); - persister.checkpoint(memento, exceptionHandler); + try { + PersistenceExceptionHandler exceptionHandler = PersistenceExceptionHandlerImpl.builder().build(); + persister.enableWriteAccess(); + persister.checkpoint(memento, exceptionHandler); + } finally { + persister.stop(true); + } } public static void writeManagerMemento(ManagementContext managementContext, ManagementPlaneSyncRecord optionalPlaneRecord,
