[brooklyn-server] 02/02: skip redundant and possibly deadlocking tasks on shutdown

[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 462e246a056451308eaf51282beb6060d92b4db3
Author: Alex Heneveld <alex.henev...@cloudsoftcorp.com>
AuthorDate: Tue Aug 10 12:12:32 2021 +0100

    skip redundant and possibly deadlocking tasks on shutdown
---
 core/src/main/java/org/apache/brooklyn/core/mgmt/ha/OsgiManager.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git 
a/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/OsgiManager.java 
b/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/OsgiManager.java
index 79b8174..5fe3eec 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/OsgiManager.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/OsgiManager.java
@@ -302,6 +302,7 @@ public class OsgiManager {
         
         if (!reuseFramework || !REUSED_FRAMEWORKS_ARE_KEPT_RUNNING) {
             try {
+                /* if not re-using, don't do this, because we might be being 
called _from_ the osgi shutdown process (can cause deadlock on karaf shutdown)
                 for (Bundle b: framework.getBundleContext().getBundles()) {
                     if ((bundlesAtStartup==null || 
!bundlesAtStartup.contains(b)) && (b!=framework)) {
                         try {
@@ -317,6 +318,10 @@ public class OsgiManager {
                 framework.stop();
                 final FrameworkEvent fe = 
framework.waitForStop(Duration.seconds(30).toMilliseconds());
                 log.debug("Stopped OSGi framework: "+fe);
+                 */
+
+                framework.stop();
+
             } catch (Exception e) {
                 throw Exceptions.propagate(e);
             }