FELIX-3647 Continue as if modify method succeeded even though it may fail.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1380116 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 21de92d..6989119 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
@@ -543,8 +543,10 @@
// invariant: modify method existing and no static bound service changes
// 4. call method (nothing to do when failed, since it has already been logged)
+ // (call with non-null default result to continue even if the
+ // modify method call failed)
final MethodResult result = m_modifyMethod.invoke( getInstance(),
- new ActivatorParameter( m_componentContext, -1 ), null );
+ new ActivatorParameter( m_componentContext, -1 ), MethodResult.VOID );
if ( result == null )
{
// log an error if the declared method cannot be found