Author: pderop
Date: Tue Mar 29 20:56:46 2011
New Revision: 1086740
URL: http://svn.apache.org/viewvc?rev=1086740&view=rev
Log:
get back to previous version of bundleStopped method, which actually must
remove all services from a stopping bundle
Modified:
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/DependencyManagerRuntime.java
Modified:
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/DependencyManagerRuntime.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/DependencyManagerRuntime.java?rev=1086740&r1=1086739&r2=1086740&view=diff
==============================================================================
---
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/DependencyManagerRuntime.java
(original)
+++
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/DependencyManagerRuntime.java
Tue Mar 29 20:56:46 2011
@@ -128,7 +128,15 @@ public class DependencyManagerRuntime
{
Log.instance().info("Runtime: Removing services from stopping bundle:
%s", b.getSymbolicName());
DependencyManager dm = m_managers.remove(b);
- // DM automatically remove services when the bundle is stopped: so, no
need to clean anything here.
+ if (dm != null)
+ {
+ List<Component> services = new ArrayList(dm.getServices());
+ for (Component service : services)
+ {
+ Log.instance().info("Runtime: Removing service: %s", service);
+ dm.remove(service);
+ }
+ }
}
/**
