felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pde...@apache.org
Subject svn commit: r1680935 - in /felix/trunk/dependencymanager/org.apache.felix.dependencymanager: resources/changelog.txt src/org/apache/felix/dm/impl/ConfigurationDependencyImpl.java
Date Thu, 21 May 2015 17:58:58 GMT
Author: pderop
Date: Thu May 21 17:58:58 2015
New Revision: 1680935

URL: http://svn.apache.org/r1680935
Log:
uncommitted the patch for FELIX-4879, which is invalid.

Modified:
    felix/trunk/dependencymanager/org.apache.felix.dependencymanager/resources/changelog.txt
    felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ConfigurationDependencyImpl.java

Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager/resources/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager/resources/changelog.txt?rev=1680935&r1=1680934&r2=1680935&view=diff
==============================================================================
--- felix/trunk/dependencymanager/org.apache.felix.dependencymanager/resources/changelog.txt
(original)
+++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager/resources/changelog.txt
Thu May 21 17:58:58 2015
@@ -8,7 +8,6 @@ Release org.apache.felix.dependencymanag
 ** Improvement
     * [FELIX-4614] - Factory create() method should have access to the component definition
     * [FELIX-4878] - Support more signatures for Dependency callbacks
-    * [FELIX-4879] - ConfigurationDependency should always "need instance".
     * [FELIX-4880] - Missing callback instance support for some adapters
     * [FELIX-4873] - Enhance DM API to get missing and circular dependencies
     

Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ConfigurationDependencyImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ConfigurationDependencyImpl.java?rev=1680935&r1=1680934&r2=1680935&view=diff
==============================================================================
--- felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ConfigurationDependencyImpl.java
(original)
+++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ConfigurationDependencyImpl.java
Thu May 21 17:58:58 2015
@@ -93,10 +93,7 @@ public class ConfigurationDependencyImpl
 
     @Override
     public boolean needsInstance() {
-    	// we need the component instances even if there is a callback instance, which could
need to access to
-    	// component instances while being invoked in the updated callback. So we return true
here, even if there
-    	// is a configured callback instance.
-        return true; 
+        return m_callbackInstance == null;
     }
 
     @Override



Mime
View raw message