You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by du...@apache.org on 2018/06/21 14:08:53 UTC
[2/3] brooklyn-server git commit: BROOKLYN-594: fix
/v1/server/ha/persist/export in karaf
BROOKLYN-594: fix /v1/server/ha/persist/export in karaf
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/f6bb2080
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/f6bb2080
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/f6bb2080
Branch: refs/heads/master
Commit: f6bb208017c198660caf5cae41a7f9b29e2e1357
Parents: 36136d6
Author: Aled Sage <al...@gmail.com>
Authored: Wed Jun 20 15:17:46 2018 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Jun 20 15:17:46 2018 +0100
----------------------------------------------------------------------
.../brooklyn/core/mgmt/persist/BrooklynPersistenceUtils.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f6bb2080/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/BrooklynPersistenceUtils.java
----------------------------------------------------------------------
diff --git 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
index 4c424b4..925b3f3 100644
--- 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
@@ -43,7 +43,7 @@ import org.apache.brooklyn.core.entity.EntityInternal;
import org.apache.brooklyn.core.mgmt.ha.ManagementPlaneSyncRecordPersisterToObjectStore;
import org.apache.brooklyn.core.mgmt.ha.OsgiManager;
import org.apache.brooklyn.core.mgmt.internal.LocalLocationManager;
-import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext;
+import org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal;
import org.apache.brooklyn.core.mgmt.rebind.PersistenceExceptionHandlerImpl;
import org.apache.brooklyn.core.mgmt.rebind.transformer.CompoundTransformer;
import org.apache.brooklyn.core.mgmt.rebind.transformer.CompoundTransformerLoader;
@@ -192,7 +192,7 @@ public class BrooklynPersistenceUtils {
for (CatalogItem<?,?> instance: mgmt.getCatalog().getCatalogItemsLegacy()) {
result.catalogItem(instance.getId(), serializer.toString(newObjectMemento(instance)));
}
- OsgiManager osgi = ((LocalManagementContext)mgmt).getOsgiManager().orNull();
+ OsgiManager osgi = ((ManagementContextInternal)mgmt).getOsgiManager().orNull();
if (osgi!=null) {
for (ManagedBundle instance: osgi.getManagedBundles().values()) {
result.bundle(instance.getId(), serializer.toString(newObjectMemento(instance)));