FELIX-4402 Fix factory component to not think the factory is a configuration
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1602636 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scr/src/main/java/org/apache/felix/scr/impl/manager/ComponentFactoryImpl.java b/scr/src/main/java/org/apache/felix/scr/impl/manager/ComponentFactoryImpl.java
index 583f069..9be2e30 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/manager/ComponentFactoryImpl.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/manager/ComponentFactoryImpl.java
@@ -465,7 +465,6 @@
public List<? extends ComponentManager<S>> getComponents()
{
List<AbstractComponentManager<S>> cms = new ArrayList<AbstractComponentManager<S>>( );
- cms.add( this );
getComponentManagers( m_componentInstances, cms );
return cms;
}
diff --git a/scr/src/test/java/org/apache/felix/scr/integration/ServiceBindGreedyTest.java b/scr/src/test/java/org/apache/felix/scr/integration/ServiceBindGreedyTest.java
index b4a491c..675649e 100644
--- a/scr/src/test/java/org/apache/felix/scr/integration/ServiceBindGreedyTest.java
+++ b/scr/src/test/java/org/apache/felix/scr/integration/ServiceBindGreedyTest.java
@@ -637,7 +637,7 @@
srv1.drop();
delay();
- findComponentConfigurationByName(name, ComponentConfigurationDTO.UNSATISFIED);
+ checkConfigurationCount(name, 0, -1);
TestCase.assertNull( instance.getInstance() );
// assert component factory only managed
diff --git a/scr/src/test/java/org/apache/felix/scr/integration/ServiceBindTest.java b/scr/src/test/java/org/apache/felix/scr/integration/ServiceBindTest.java
index 299f5fa..20fa8ca 100644
--- a/scr/src/test/java/org/apache/felix/scr/integration/ServiceBindTest.java
+++ b/scr/src/test/java/org/apache/felix/scr/integration/ServiceBindTest.java
@@ -638,7 +638,7 @@
srv1.drop();
delay();
- findComponentConfigurationByName(name, ComponentConfigurationDTO.UNSATISFIED);
+ checkConfigurationCount(name, 0, -1);
TestCase.assertNull( instance.getInstance() );
// assert component factory only managed