Deprecate RebindManager.rebind() - pass in correct classloader (i.e. catalogâs class loader)
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/7100e733 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/7100e733 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/7100e733 Branch: refs/heads/master Commit: 7100e733b378fb08a82337ca889638d7b2196eea Parents: 86b35c5 Author: Aled Sage <aled.s...@gmail.com> Authored: Thu Jun 5 23:08:17 2014 +0200 Committer: Aled Sage <aled.s...@gmail.com> Committed: Fri Jun 6 16:32:32 2014 +0200 ---------------------------------------------------------------------- api/src/main/java/brooklyn/entity/rebind/RebindManager.java | 4 ++++ core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java | 2 +- .../java/brooklyn/management/ha/HighAvailabilityManagerImpl.java | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7100e733/api/src/main/java/brooklyn/entity/rebind/RebindManager.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/brooklyn/entity/rebind/RebindManager.java b/api/src/main/java/brooklyn/entity/rebind/RebindManager.java index 309dedf..779fee7 100644 --- a/api/src/main/java/brooklyn/entity/rebind/RebindManager.java +++ b/api/src/main/java/brooklyn/entity/rebind/RebindManager.java @@ -35,6 +35,10 @@ public interface RebindManager { @VisibleForTesting public BrooklynMementoPersister getPersister(); + /** + * @deprecated since 0.7; use {@link #rebind(ClassLoader)} + */ + @Deprecated public List<Application> rebind() throws IOException; public List<Application> rebind(ClassLoader classLoader) throws IOException; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7100e733/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java b/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java index c0c45ca..c2dc932 100644 --- a/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java +++ b/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java @@ -195,7 +195,7 @@ public class RebindManagerImpl implements RebindManager { @Override public List<Application> rebind() throws IOException { - return rebind(getClass().getClassLoader()); + return rebind(managementContext.getCatalog().getRootClassLoader()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7100e733/core/src/main/java/brooklyn/management/ha/HighAvailabilityManagerImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/ha/HighAvailabilityManagerImpl.java b/core/src/main/java/brooklyn/management/ha/HighAvailabilityManagerImpl.java index f19dcec..9d7dd57 100644 --- a/core/src/main/java/brooklyn/management/ha/HighAvailabilityManagerImpl.java +++ b/core/src/main/java/brooklyn/management/ha/HighAvailabilityManagerImpl.java @@ -410,7 +410,7 @@ public class HighAvailabilityManagerImpl implements HighAvailabilityManager { nodeState = ManagementNodeState.MASTER; publishPromotionToMaster(); try { - managementContext.getRebindManager().rebind(); + managementContext.getRebindManager().rebind(managementContext.getCatalog().getRootClassLoader()); } catch (Exception e) { LOG.info("Problem during rebind when promoting node to master; demoting to failed and rethrowing): "+e); nodeState = ManagementNodeState.FAILED;
