| commit | 3b4b6ff550600a83878dc46f83ed39f28f97f4e9 | [log] [tgz] |
|---|---|---|
| author | Richard S. Hall <rickhall@apache.org> | Mon Aug 29 15:03:01 2011 +0000 |
| committer | Richard S. Hall <rickhall@apache.org> | Mon Aug 29 15:03:01 2011 +0000 |
| tree | 3677a1880f0e0109f917953cd9ac099f6fb0358c | |
| parent | 5245d4843fe67c67a18e7b19f6dc34b6b418613c [diff] |
Remove system bundle dependents when stopping the framework. (FELIX-2467) git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1162843 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/framework/src/main/java/org/apache/felix/framework/BundleRevisionDependencies.java b/framework/src/main/java/org/apache/felix/framework/BundleRevisionDependencies.java index 9948ad0..1e3a8fe 100644 --- a/framework/src/main/java/org/apache/felix/framework/BundleRevisionDependencies.java +++ b/framework/src/main/java/org/apache/felix/framework/BundleRevisionDependencies.java
@@ -82,12 +82,12 @@ } } } - +*/ public synchronized void removeDependents(BundleRevision provider) { m_dependentsMap.remove(provider); } -*/ + public synchronized Map<BundleCapability, Set<BundleWire>> getDependents(BundleRevision provider) {
diff --git a/framework/src/main/java/org/apache/felix/framework/Felix.java b/framework/src/main/java/org/apache/felix/framework/Felix.java index 0110086..f9200e5 100644 --- a/framework/src/main/java/org/apache/felix/framework/Felix.java +++ b/framework/src/main/java/org/apache/felix/framework/Felix.java
@@ -4647,6 +4647,8 @@ m_securityManager = null; } + m_dependencies.removeDependents(adapt(BundleRevision.class)); + if (m_extensionManager != null) { m_extensionManager.removeExtensions(Felix.this);