[brooklyn-server] branch master updated: minor fixes to policy lifecycle

[heneveld]

This is an automated email from the ASF dual-hosted git repository.

heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git


The following commit(s) were added to refs/heads/master by this push:
     new 6ccee744b9 minor fixes to policy lifecycle
6ccee744b9 is described below

commit 6ccee744b9f34d60bd45cd95d41f654118b59a29
Author: Alex Heneveld <a...@cloudsoft.io>
AuthorDate: Tue Dec 13 10:54:47 2022 +0000

    minor fixes to policy lifecycle
---
 .../main/java/org/apache/brooklyn/core/workflow/WorkflowPolicy.java | 6 ++++--
 .../java/org/apache/brooklyn/entity/group/DynamicClusterImpl.java   | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git 
a/core/src/main/java/org/apache/brooklyn/core/workflow/WorkflowPolicy.java 
b/core/src/main/java/org/apache/brooklyn/core/workflow/WorkflowPolicy.java
index 4d284c5596..d508e9ffc6 100644
--- a/core/src/main/java/org/apache/brooklyn/core/workflow/WorkflowPolicy.java
+++ b/core/src/main/java/org/apache/brooklyn/core/workflow/WorkflowPolicy.java
@@ -147,8 +147,10 @@ public final class WorkflowPolicy<T> extends 
AbstractPolicy {
 
     @Override
     public void resume() {
+        boolean wasSuspended = isSuspended();
         super.resume();
-
-        poller.start();
+        if (!wasSuspended) poller.start();
     }
+
 }
+
diff --git 
a/core/src/main/java/org/apache/brooklyn/entity/group/DynamicClusterImpl.java 
b/core/src/main/java/org/apache/brooklyn/entity/group/DynamicClusterImpl.java
index f19c9e0985..ff933daacb 100644
--- 
a/core/src/main/java/org/apache/brooklyn/entity/group/DynamicClusterImpl.java
+++ 
b/core/src/main/java/org/apache/brooklyn/entity/group/DynamicClusterImpl.java
@@ -514,7 +514,7 @@ public class DynamicClusterImpl extends AbstractGroupImpl 
implements DynamicClus
         }
 
         for (Policy it : policies()) {
-            it.resume();
+            if (it.isSuspended()) it.resume();
         }
     }