You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by dj...@apache.org on 2012/10/18 08:51:09 UTC
svn commit: r1399531 -
/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
Author: djencks
Date: Thu Oct 18 06:51:08 2012
New Revision: 1399531
URL: http://svn.apache.org/viewvc?rev=1399531&view=rev
Log:
FELIX-3668 revert 1381440 missing bind method should not prevent activation
Modified:
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java?rev=1399531&r1=1399530&r2=1399531&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java (original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java Thu Oct 18 06:51:08 2012
@@ -1155,17 +1155,14 @@ public class DependencyManager implement
for ( Iterator i = parameters.entrySet().iterator(); i.hasNext(); )
{
Map.Entry entry = ( Map.Entry ) i.next();
- if ( invokeBindMethod( componentInstance, ( RefPair ) entry.getValue() ) )
- {
- success = true;
- }
- else
+ if ( !invokeBindMethod( componentInstance, ( RefPair ) entry.getValue() ) )
{
m_componentManager.log( LogService.LOG_DEBUG,
- "For dependency {0}, failed to invoke bind method on object {1}; success: {2}",
- new Object[]{ m_dependencyMetadata.getName(), entry.getValue(), new Boolean( success )}, null );
+ "For dependency {0}, failed to invoke bind method on object {1}",
+ new Object[] {m_dependencyMetadata.getName(), entry.getValue()}, null );
}
+ success = true;
}
return success;
}