| commit | 717f42455c345f0fcee5f6dbf977db797b325bec | [log] [tgz] |
|---|---|---|
| author | Clement Escoffier <clement@apache.org> | Wed Aug 01 10:18:58 2012 +0000 |
| committer | Clement Escoffier <clement@apache.org> | Wed Aug 01 10:18:58 2012 +0000 |
| tree | 79bae87431cf54d8c37dd07b0d3351900ce639da | |
| parent | 2f84783156bbb2582ebd3b7dafa37c40d58e6291 [diff] |
Apply patch for FELIX-3599. git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1367907 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/service/instantiator/ServiceDependencyHandler.java b/ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/service/instantiator/ServiceDependencyHandler.java index 5c1d8e0..e1686d4 100644 --- a/ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/service/instantiator/ServiceDependencyHandler.java +++ b/ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/service/instantiator/ServiceDependencyHandler.java
@@ -87,8 +87,8 @@ Enumeration keys = conf.keys(); while(keys.hasMoreElements()) { String key = (String) keys.nextElement(); - if (! key.equals("instance.name") - || key.equals("component")) { // Remove instance.name and component + if (! (key.equals("instance.name") + || key.equals("component"))) { // Remove instance.name and component toAppend.put(key, conf.get(key)); } }