felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1602636 - in /felix/trunk/scr/src: main/java/org/apache/felix/scr/impl/manager/ComponentFactoryImpl.java test/java/org/apache/felix/scr/integration/ServiceBindGreedyTest.java test/java/org/apache/felix/scr/integration/ServiceBindTest.java
Date Sun, 15 Jun 2014 01:09:42 GMT
Author: djencks
Date: Sun Jun 15 01:09:42 2014
New Revision: 1602636

URL: http://svn.apache.org/r1602636
Log:
FELIX-4402 Fix factory component to not think the factory is a configuration

Modified:
    felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ComponentFactoryImpl.java
    felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/ServiceBindGreedyTest.java
    felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/ServiceBindTest.java

Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ComponentFactoryImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ComponentFactoryImpl.java?rev=1602636&r1=1602635&r2=1602636&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ComponentFactoryImpl.java
(original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ComponentFactoryImpl.java
Sun Jun 15 01:09:42 2014
@@ -465,7 +465,6 @@ public class ComponentFactoryImpl<S> ext
 	public List<? extends ComponentManager<S>> getComponents()
     {
         List<AbstractComponentManager<S>> cms = new ArrayList<AbstractComponentManager<S>>(
);
-        cms.add( this );
         getComponentManagers( m_componentInstances, cms );
         return cms;
     }

Modified: felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/ServiceBindGreedyTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/ServiceBindGreedyTest.java?rev=1602636&r1=1602635&r2=1602636&view=diff
==============================================================================
--- felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/ServiceBindGreedyTest.java
(original)
+++ felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/ServiceBindGreedyTest.java
Sun Jun 15 01:09:42 2014
@@ -637,7 +637,7 @@ public class ServiceBindGreedyTest exten
         srv1.drop();
         delay();
 
-        findComponentConfigurationByName(name, ComponentConfigurationDTO.UNSATISFIED);
+        checkConfigurationCount(name, 0, -1);
         TestCase.assertNull( instance.getInstance() );
 
         // assert component factory only managed

Modified: felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/ServiceBindTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/ServiceBindTest.java?rev=1602636&r1=1602635&r2=1602636&view=diff
==============================================================================
--- felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/ServiceBindTest.java (original)
+++ felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/ServiceBindTest.java Sun
Jun 15 01:09:42 2014
@@ -638,7 +638,7 @@ public class ServiceBindTest extends Com
         srv1.drop();
         delay();
 
-        findComponentConfigurationByName(name, ComponentConfigurationDTO.UNSATISFIED);
+        checkConfigurationCount(name, 0, -1);
         TestCase.assertNull( instance.getInstance() );
 
         // assert component factory only managed



Mime
View raw message