You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by dj...@apache.org on 2012/10/03 21:31:44 UTC
svn commit: r1393714 -
/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/BundleComponentActivator.java
Author: djencks
Date: Wed Oct 3 19:31:43 2012
New Revision: 1393714
URL: http://svn.apache.org/viewvc?rev=1393714&view=rev
Log:
FELIX-3697 enable components after all of them are known
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=1393714&r1=1393713&r2=1393714&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:43 2012
@@ -147,6 +147,15 @@ public class BundleComponentActivator im
loadDescriptor( descriptorURLs[i] );
}
}
+ //enable all the enabled components
+ for (Iterator it = m_managers.iterator(); it.hasNext();)
+ {
+ ComponentHolder componentHolder = ( ComponentHolder ) it.next();
+ if (componentHolder.getComponentMetadata().isEnabled())
+ {
+ componentHolder.enableComponents( false );
+ }
+ }
}
@@ -239,11 +248,6 @@ public class BundleComponentActivator im
m_componentRegistry.registerComponentHolder( key, holder );
m_managers.add( holder );
- // enable the component
- if ( metadata.isEnabled() )
- {
- holder.enableComponents( false );
- }
}
catch ( Throwable t )
{