(brooklyn-server) 01/02: allow rebind tests to terminate mgmt context

[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

commit 2ccea71200a0427b589e8c5ba761fe3e52f95184
Author: Alex Heneveld <a...@cloudsoft.io>
AuthorDate: Thu Mar 28 23:40:11 2024 +0000

    allow rebind tests to terminate mgmt context
    
    for use when rebinding from known state
---
 .../brooklyn/launcher/blueprints/AbstractBlueprintTest.java    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git 
a/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/AbstractBlueprintTest.java
 
b/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/AbstractBlueprintTest.java
index a03ee10eec..196325e4ad 100644
--- 
a/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/AbstractBlueprintTest.java
+++ 
b/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/AbstractBlueprintTest.java
@@ -63,6 +63,7 @@ import java.io.File;
 import java.io.Reader;
 import java.io.StringReader;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Consumer;
@@ -270,14 +271,15 @@ public abstract class AbstractBlueprintTest {
 
         ManagementContext origMgmt = mgmt;
         ManagementContext newMgmt = createNewManagementContext();
-        Collection<Application> origApps = origMgmt.getApplications();
-        
+        boolean origRunning = origMgmt != null && origMgmt.isRunning();
+        Collection<Application> origApps = origRunning ? 
origMgmt.getApplications() : Collections.emptyList();
+
         options = RebindOptions.create(options);
         if (options.classLoader == null) options.classLoader(classLoader);
         if (options.mementoDir == null) options.mementoDir(mementoDir);
-        if (options.origManagementContext == null) 
options.origManagementContext(origMgmt);
+        if (options.origManagementContext == null && origRunning) 
options.origManagementContext(origMgmt);
         if (options.newManagementContext == null) 
options.newManagementContext(newMgmt);
-        
+
         for (Application origApp : origApps) {
             RebindTestUtils.stopPersistence(origApp);
         }