felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r982606 - /felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java
Date Thu, 05 Aug 2010 13:22:34 GMT
Author: fmeschbe
Date: Thu Aug  5 13:22:34 2010
New Revision: 982606

URL: http://svn.apache.org/viewvc?rev=982606&view=rev
Log:
FELIX-2523 Reactivate the component if configuration is deleted. The modified method must
not be called in this case.

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

Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java?rev=982606&r1=982605&r2=982606&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java
(original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java
Thu Aug  5 13:22:34 2010
@@ -413,7 +413,7 @@ public class ImmediateComponentManager e
         {
             deactivateInternal( ComponentConstants.DEACTIVATION_REASON_CONFIGURATION_DELETED
);
         }
-        else if ( !modify() )
+        else if ( configuration == null | !modify() )
         {
             // SCR 112.7.1 - deactivate if configuration is deleted or no modified method
declared
             log( LogService.LOG_DEBUG, "Deactivating and Activating to reconfigure from configuration",
null );



Mime
View raw message