| commit | 5d33bfd997935fde10a2c4dfb23db3569fcb231a | [log] [tgz] |
|---|---|---|
| author | Felix Meschberger <fmeschbe@apache.org> | Thu Aug 05 13:22:34 2010 +0000 |
| committer | Felix Meschberger <fmeschbe@apache.org> | Thu Aug 05 13:22:34 2010 +0000 |
| tree | 56c36af70fbd8753af75e7e1b88ff73ddaafea10 | |
| parent | be9a81c209f32102092096e5008d7b9df11170a7 [diff] |
FELIX-2523 Reactivate the component if configuration is deleted. The modified method must not be called in this case. git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@982606 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java b/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java index be42530..6c4ad20 100644 --- a/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java +++ b/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java
@@ -413,7 +413,7 @@ { 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 );