Author: fmeschbe
Date: Mon Sep 3 02:55:01 2012
New Revision: 1380116
URL: http://svn.apache.org/viewvc?rev=1380116&view=rev
Log:
FELIX-3647 Continue as if modify method succeeded even though it may fail.
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=1380116&r1=1380115&r2=1380116&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
Mon Sep 3 02:55:01 2012
@@ -543,8 +543,10 @@ public class ImmediateComponentManager e
// 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
