felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1397884 - /felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
Date Sat, 13 Oct 2012 16:15:10 GMT
Author: djencks
Date: Sat Oct 13 16:15:10 2012
New Revision: 1397884

URL: http://svn.apache.org/viewvc?rev=1397884&view=rev
Log:
FElIX-3710 don't try to activate on an optional service event

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

Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java?rev=1397884&r1=1397883&r2=1397884&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
(original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
Sat Oct 13 16:15:10 2012
@@ -328,7 +328,7 @@ public class DependencyManager implement
         // if the component is currently unsatisfied, it may become satisfied
         // by adding this service, try to activate (also schedule activation
         // if the component is pending deactivation)
-        if ( m_componentManager.getState() == AbstractComponentManager.STATE_UNSATISFIED
)
+        if ( m_componentManager.getState() == AbstractComponentManager.STATE_UNSATISFIED
&& !isOptional() )
         {
             m_componentManager.log( LogService.LOG_DEBUG,
                 "Dependency Manager: Service {0} registered, activate component", new Object[]



Mime
View raw message