Don't deactive services from a stopping bundle, since DependencyManager is already doing this.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1086718 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/DependencyManagerRuntime.java b/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/DependencyManagerRuntime.java
index 482d2c3..07d61d8 100644
--- a/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/DependencyManagerRuntime.java
+++ b/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/DependencyManagerRuntime.java
@@ -32,7 +32,7 @@
/**
* This class parses service descriptors generated by the annotation bnd processor.
- * The descriptors are located under OSGI-INF/dependencymanager directory. Such files are actually
+ * The descriptors are located under META-INF/dependencymanager directory. Such files are actually
* referenced by a specific "DependendencyManager-Component" manifest header.
*/
public class DependencyManagerRuntime
@@ -128,15 +128,7 @@
{
Log.instance().info("Runtime: Removing services from stopping bundle: %s", b.getSymbolicName());
DependencyManager dm = m_managers.remove(b);
- 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);
- }
- }
+ // DM automatically remove services when the bundle is stopped: so, no need to clean anything here.
}
/**