commit 24b5da84128b55ac5cdeb3e99e29d4085a6028fb
author Clement Escoffier <clement@apache.org> Sun Apr 15 08:28:52 2012 +0000
committer Clement Escoffier <clement@apache.org> Sun Apr 15 08:28:52 2012 +0000
tree 82f59c112ec6c368c0797532514bf91ec43ffa2e
parent 8addb8a701ff21d82ddcd3efdab9d3eeded5f9bf

Fix FELIX-3451

Replace name by instance.name.



git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1326271 13f79535-47bb-0310-9956-ffa450edef68

ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/instance/InstanceHandler.java

diff --git a/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/instance/InstanceHandler.java b/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/instance/InstanceHandler.java
index bda4ac3..696217c 100644
--- a/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/instance/InstanceHandler.java
+++ b/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/instance/InstanceHandler.java
@@ -258,7 +258,7 @@
             }

 

             Properties instanceConfiguration = new Properties();

-             instanceConfiguration.putAll(conf);

+            instanceConfiguration.putAll(conf);

             instanceConfiguration.putAll(toAppend);

             m_configurations[i] = new ManagedConfiguration(instanceConfiguration);

         }

@@ -276,7 +276,7 @@
         Properties dict = new Properties();

         String name = instance.getAttribute("name");

         if (name != null) {

-            dict.put("name", name);

+            dict.put("instance.name", name);

         }

 

         String comp = instance.getAttribute("component");