svn commit: r1393715 - /felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/BundleComponentActivator.java

[dj...@apache.org]

Author: djencks
Date: Wed Oct  3 19:31:46 2012
New Revision: 1393715

URL: http://svn.apache.org/viewvc?rev=1393715&view=rev
Log:
FELIX-3698 obtain ComponentHolder directly from ComponentRegistry

Modified:
    felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/BundleComponentActivator.java

Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/BundleComponentActivator.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/BundleComponentActivator.java?rev=1393715&r1=1393714&r2=1393715&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/BundleComponentActivator.java (original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/BundleComponentActivator.java Wed Oct  3 19:31:46 2012
@@ -461,19 +461,10 @@ public class BundleComponentActivator im
             return ( ComponentHolder[] ) m_managers.toArray( new ComponentHolder[m_managers.size()] );
         }
 
-        if ( m_componentRegistry.getComponentHolder( m_context.getBundle(), name ) != null )
+        ComponentHolder componentHolder = m_componentRegistry.getComponentHolder( m_context.getBundle(), name );
+        if (componentHolder != null)
         {
-            // otherwise just find it
-            Iterator it = m_managers.iterator();
-            while ( it.hasNext() )
-            {
-                ComponentHolder cm = ( ComponentHolder ) it.next();
-                if ( name.equals( cm.getComponentMetadata().getName() ) )
-                {
-                    return new ComponentHolder[]
-                        { cm };
-                }
-            }
+            return new ComponentHolder[] { componentHolder };
         }
 
         // if the component is not known