You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2015/08/27 16:43:14 UTC

svn commit: r1698171 - /felix/trunk/scr-compat/src/main/java/org/apache/felix/scr/impl/compat/ScrServiceImpl.java

Author: cziegeler
Date: Thu Aug 27 14:43:14 2015
New Revision: 1698171

URL: http://svn.apache.org/r1698171
Log:
FELIX-5016 : [scr.compat] ScrServiceImpl.getComponents() returns no components

Modified:
    felix/trunk/scr-compat/src/main/java/org/apache/felix/scr/impl/compat/ScrServiceImpl.java

Modified: felix/trunk/scr-compat/src/main/java/org/apache/felix/scr/impl/compat/ScrServiceImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr-compat/src/main/java/org/apache/felix/scr/impl/compat/ScrServiceImpl.java?rev=1698171&r1=1698170&r2=1698171&view=diff
==============================================================================
--- felix/trunk/scr-compat/src/main/java/org/apache/felix/scr/impl/compat/ScrServiceImpl.java (original)
+++ felix/trunk/scr-compat/src/main/java/org/apache/felix/scr/impl/compat/ScrServiceImpl.java Thu Aug 27 14:43:14 2015
@@ -76,7 +76,7 @@ public class ScrServiceImpl implements S
     {
         List<Component> result = new ArrayList<Component>();
 
-        final Collection<ComponentDescriptionDTO> descriptions = this.runtime.getComponentDescriptionDTOs(bundle);
+        final Collection<ComponentDescriptionDTO> descriptions = (bundle == null ? this.runtime.getComponentDescriptionDTOs() : this.runtime.getComponentDescriptionDTOs(bundle));
         for(final ComponentDescriptionDTO descDTO : descriptions )
         {
             final Collection<ComponentConfigurationDTO> configs = this.runtime.getComponentConfigurationDTOs(descDTO);