felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1611156 - /felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/SingleComponentManager.java
Date Wed, 16 Jul 2014 19:55:54 GMT
Author: djencks
Date: Wed Jul 16 19:55:54 2014
New Revision: 1611156

URL: http://svn.apache.org/r1611156
Log:
[FELIX-4402] fix determination of reason for deactivation when configuration is deleted

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

Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/SingleComponentManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/SingleComponentManager.java?rev=1611156&r1=1611155&r2=1611156&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/SingleComponentManager.java
(original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/SingleComponentManager.java
Wed Jul 16 19:55:54 2014
@@ -583,7 +583,7 @@ public class SingleComponentManager<S> e
                 {
                     // 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 );
-                    int reason = ( m_configurationProperties == null ) ? ComponentConstants.DEACTIVATION_REASON_CONFIGURATION_DELETED
+                    int reason = configurationDeleted ? ComponentConstants.DEACTIVATION_REASON_CONFIGURATION_DELETED
                             : ComponentConstants.DEACTIVATION_REASON_CONFIGURATION_MODIFIED;
 
                     // FELIX-2368: cycle component immediately, reconfigure() is



Mime
View raw message