You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ma...@apache.org on 2009/12/17 16:14:18 UTC
svn commit: r891750 - in
/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl:
AdapterImpl.java AspectImpl.java
Author: marrs
Date: Thu Dec 17 15:14:10 2009
New Revision: 891750
URL: http://svn.apache.org/viewvc?rev=891750&view=rev
Log:
added the same optimization I added to resource adapters to the aspect and adapter
Modified:
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AdapterImpl.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AspectImpl.java
Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AdapterImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AdapterImpl.java?rev=891750&r1=891749&r2=891750&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AdapterImpl.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AdapterImpl.java Thu Dec 17 15:14:10 2009
@@ -20,6 +20,7 @@
import java.util.Dictionary;
import java.util.Enumeration;
+import java.util.List;
import java.util.Properties;
import org.apache.felix.dm.service.Service;
@@ -64,11 +65,13 @@
props.put(key, m_adapterProperties.get(key));
}
}
+ List dependencies = m_service.getDependencies();
+ dependencies.remove(0);
if (m_adapterInterface instanceof String) {
return m_manager.createService()
.setInterface((String) m_adapterInterface, props)
.setImplementation(m_adapterImplementation)
- .add(m_service.getDependencies())
+ .add(dependencies)
.add(m_manager.createServiceDependency()
.setService(m_serviceInterface, ref)
.setRequired(true)
@@ -78,7 +81,7 @@
return m_manager.createService()
.setInterface((String[]) m_adapterInterface, props)
.setImplementation(m_adapterImplementation)
- .add(m_service.getDependencies())
+ .add(dependencies)
.add(m_manager.createServiceDependency()
.setService(m_serviceInterface, ref)
.setRequired(true)
Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AspectImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AspectImpl.java?rev=891750&r1=891749&r2=891750&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AspectImpl.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AspectImpl.java Thu Dec 17 15:14:10 2009
@@ -20,6 +20,7 @@
import java.util.Dictionary;
import java.util.Enumeration;
+import java.util.List;
import java.util.Properties;
import org.apache.felix.dm.service.Service;
@@ -54,10 +55,12 @@
props.put(key, m_aspectProperties.get(key));
}
}
+ List dependencies = m_service.getDependencies();
+ dependencies.remove(0);
return m_manager.createService()
.setInterface(m_serviceInterface.getName(), props)
.setImplementation(m_aspectImplementation)
- .add(m_service.getDependencies())
+ .add(dependencies)
.add(m_manager.createServiceDependency()
.setService(m_serviceInterface, ref)
.setRequired(true));