From fc5abc7164b11b11107efa276cfa2b90928d3228 Mon Sep 17 00:00:00 2001
From: Aled Sage <aled.sage@gmail.com>
Date: Wed, 12 Sep 2018 14:43:54 +0100
Subject: [PATCH] Revert "This closes #988"

This reverts commit f6ad11846de2d9ba2e9004648179270e3ca3c25f, reversing
changes made to c782aae54f424e317c0999f5cde3fab19bc45cfb.
---
 .../org/apache/brooklyn/core/objs/AbstractEntityAdjunct.java  | 2 --
 .../java/org/apache/brooklyn/core/policy/AbstractPolicy.java  | 4 +++-
 .../policy/autoscaling/AutoScalerPolicyRebindTest.java        | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/apache/brooklyn/core/objs/AbstractEntityAdjunct.java b/core/src/main/java/org/apache/brooklyn/core/objs/AbstractEntityAdjunct.java
index 1e4407cfd6..8838eab159 100644
--- a/core/src/main/java/org/apache/brooklyn/core/objs/AbstractEntityAdjunct.java
+++ b/core/src/main/java/org/apache/brooklyn/core/objs/AbstractEntityAdjunct.java
@@ -488,7 +488,6 @@ public Map<String, HighlightTuple> getHighlights() {
      */
     protected void setHighlight(String name, HighlightTuple tuple) {
         highlights.put(name, tuple);
-        requestPersist();
     }
 
     /** As {@link #setHighlight(String, HighlightTuple)}, convenience for recording an item which is intended to be ongoing. */
@@ -575,7 +574,6 @@ protected void highlightViolation(String description) {
     public void setHighlights(Map<String, HighlightTuple> highlights) {
         if(highlights != null) {
             this.highlights.putAll(highlights);
-            requestPersist();
         }
     }
 
diff --git a/core/src/main/java/org/apache/brooklyn/core/policy/AbstractPolicy.java b/core/src/main/java/org/apache/brooklyn/core/policy/AbstractPolicy.java
index c29beddc3a..01cce230d6 100644
--- a/core/src/main/java/org/apache/brooklyn/core/policy/AbstractPolicy.java
+++ b/core/src/main/java/org/apache/brooklyn/core/policy/AbstractPolicy.java
@@ -99,7 +99,9 @@ public boolean isRunning() {
     @Override
     protected void onChanged() {
         // currently changes simply trigger re-persistence; there is no intermediate listener as we do for EntityChangeListener
-        requestPersist();
+        if (getManagementContext() != null) {
+            getManagementContext().getRebindManager().getChangeListener().onChanged(this);
+        }
     }
     
     @Override
diff --git a/policy/src/test/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicyRebindTest.java b/policy/src/test/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicyRebindTest.java
index e30ae771e9..bf7d150d92 100644
--- a/policy/src/test/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicyRebindTest.java
+++ b/policy/src/test/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicyRebindTest.java
@@ -157,7 +157,8 @@ public void testAutoScalerHighlightAfterRebind() throws Exception {
         Map<String, HighlightTuple> highlights = new HashMap<>();
         highlights.put("testNameTask",  new HighlightTuple("testDescription", 123L, "testTaskId"));
 
-        AutoScalerPolicy originalPolicy = (AutoScalerPolicy) Iterables.getOnlyElement(origCluster.policies());
+
+        Policy originalPolicy = origCluster.policies().iterator().next();
         ((AbstractEntityAdjunct)originalPolicy).setHighlights(highlights);
 
         TestApplication newApp = rebind();