Fix shutdown in HOT modes. HA in HOT modes calls back into the ManagementContext, but it's flagged !running at this point so stopping fails. The solution is to mark it !running after HA stops.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/c29af218 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/c29af218 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/c29af218 Branch: refs/heads/master Commit: c29af218e8b62694045a50d19880d359ec20de07 Parents: dab99ee Author: Svetoslav Neykov <[email protected]> Authored: Mon Dec 1 18:14:19 2014 +0200 Committer: Svetoslav Neykov <[email protected]> Committed: Thu Jan 29 16:36:54 2015 +0200 ---------------------------------------------------------------------- .../brooklyn/management/internal/AbstractManagementContext.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c29af218/core/src/main/java/brooklyn/management/internal/AbstractManagementContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/internal/AbstractManagementContext.java b/core/src/main/java/brooklyn/management/internal/AbstractManagementContext.java index d7cf097..322de27 100644 --- a/core/src/main/java/brooklyn/management/internal/AbstractManagementContext.java +++ b/core/src/main/java/brooklyn/management/internal/AbstractManagementContext.java @@ -188,8 +188,8 @@ public abstract class AbstractManagementContext implements ManagementContextInte @Override public void terminate() { - running = false; highAvailabilityManager.stop(); + running = false; rebindManager.stop(); storage.terminate(); // Don't unmanage everything; different entities get given their events at different times
