| commit | 7b5d1d1cdd6d1f1d244cbd272cf9dfa17c9308b7 | [log] [tgz] |
|---|---|---|
| author | Pierre De Rop <pderop@apache.org> | Thu May 21 17:58:58 2015 +0000 |
| committer | Pierre De Rop <pderop@apache.org> | Thu May 21 17:58:58 2015 +0000 |
| tree | 1d426f8c268a0b8b416d848d53d85e5e97a85328 | |
| parent | 04d0a0098b3b86719a82f25e84724fd7ee9f4bcc [diff] |
uncommitted the patch for FELIX-4879, which is invalid. git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1680935 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dependencymanager/org.apache.felix.dependencymanager/resources/changelog.txt b/dependencymanager/org.apache.felix.dependencymanager/resources/changelog.txt index 98e76f2..3b3bd52 100644 --- a/dependencymanager/org.apache.felix.dependencymanager/resources/changelog.txt +++ b/dependencymanager/org.apache.felix.dependencymanager/resources/changelog.txt
@@ -8,7 +8,6 @@ ** 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
diff --git a/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ConfigurationDependencyImpl.java b/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ConfigurationDependencyImpl.java index 8f5f70b..da7ce84 100644 --- a/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ConfigurationDependencyImpl.java +++ b/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ConfigurationDependencyImpl.java
@@ -93,10 +93,7 @@ @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