(brooklyn-server) branch master updated: fix for intermittent test failure

[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 f07615de61 fix for intermittent test failure
f07615de61 is described below

commit f07615de619ecbde54dd2f6100418fd2bf1f850b
Author: Alex Heneveld <g...@alex.heneveld.org>
AuthorDate: Tue Jul 30 09:35:01 2024 +0100

    fix for intermittent test failure
---
 .../apache/brooklyn/core/mgmt/rebind/RebindManagerImpl.java   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git 
a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindManagerImpl.java
 
b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindManagerImpl.java
index 312edd896b..3783a4321a 100644
--- 
a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindManagerImpl.java
+++ 
b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindManagerImpl.java
@@ -387,13 +387,14 @@ public class RebindManagerImpl implements RebindManager {
     @Override
     public void stopReadOnly() {
         readOnlyRunning = false;
-        if (readOnlyTask!=null) {
+        ScheduledTask rt = readOnlyTask;
+        if (rt!=null) {
             LOG.debug("Stopping read-only rebinding ("+this+"), mgmt 
"+managementContext.getManagementNodeId());
-            readOnlyTask.cancel(true);
-            readOnlyTask.blockUntilEnded();
-            boolean reallyEnded = 
Tasks.blockUntilInternalTasksEnded(readOnlyTask, Duration.TEN_SECONDS);
+            rt.cancel(true);
+            rt.blockUntilEnded();
+            boolean reallyEnded = Tasks.blockUntilInternalTasksEnded(rt, 
Duration.TEN_SECONDS);
             if (!reallyEnded) {
-                LOG.warn("Rebind (read-only) tasks took too long to die after 
interrupt (ignoring): "+readOnlyTask);
+                LOG.warn("Rebind (read-only) tasks took too long to die after 
interrupt (ignoring): "+rt);
             }
             readOnlyTask = null;
             if (persistenceStoreAccess!=null) {