Author: pderop
Date: Tue Mar 29 20:19:19 2011
New Revision: 1086718
URL: http://svn.apache.org/viewvc?rev=1086718&view=rev
Log:
Don't deactive services from a stopping bundle, since DependencyManager is
already doing this.
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=1086718&r1=1086717&r2=1086718&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:19:19 2011
@@ -32,7 +32,7 @@ import org.osgi.framework.Bundle;
/**
* 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 @@ public class DependencyManagerRuntime
{
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.
}
/**
