Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2020-05-18 18:16:17 +0000
committerThomas Watson2020-05-18 18:16:17 +0000
commit3bc986c22e78806d076a6830a590c2b6f9d23d26 (patch)
tree5f5a6a06af5a0f01e06be33c49cc8ffc1841fe87
parent01ffcf50611440654461f402bb1dd3008477f531 (diff)
downloadrt.equinox.framework-I20200519-1010.tar.gz
rt.equinox.framework-I20200519-1010.tar.xz
rt.equinox.framework-I20200519-1010.zip
The STOPPED_SYSTEM_REFRESHED event was new in the OSGi R7 specification but the code listening for framework STOPPED events to close the event manager was not updated to pay attention to the new event. The result is that when this new event is used during framework shutdown the event manager is not closed, causing a thread to remain active after framework stop. Change-Id: Ib1a1c360ede7ad1b733556bc2ce44c5469c984b2 Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxEventPublisher.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxEventPublisher.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxEventPublisher.java
index 8df1049fa..fcbae3ee6 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxEventPublisher.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxEventPublisher.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012, 2017 IBM Corporation and others.
+ * Copyright (c) 2012, 2020 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -46,7 +46,8 @@ import org.osgi.framework.hooks.bundle.EventHook;
public class EquinoxEventPublisher {
static final String eventHookName = EventHook.class.getName();
static final String collisionHookName = CollisionHook.class.getName();
- static final int FRAMEWORK_STOPPED_MASK = (FrameworkEvent.STOPPED | FrameworkEvent.STOPPED_BOOTCLASSPATH_MODIFIED | FrameworkEvent.STOPPED_UPDATE);
+ static final int FRAMEWORK_STOPPED_MASK = (FrameworkEvent.STOPPED | FrameworkEvent.STOPPED_BOOTCLASSPATH_MODIFIED
+ | FrameworkEvent.STOPPED_UPDATE | FrameworkEvent.STOPPED_SYSTEM_REFRESHED);
static final int BUNDLEEVENT = 1;
static final int BUNDLEEVENTSYNC = 2;

Back to the top