svn commit: r1326271 - /felix/trunk/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/instance/InstanceHandler.java

[clement]

Author: clement
Date: Sun Apr 15 08:28:52 2012
New Revision: 1326271

URL: http://svn.apache.org/viewvc?rev=1326271&view=rev
Log:
Fix FELIX-3451

Replace name by instance.name.


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

Modified: 
felix/trunk/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/instance/InstanceHandler.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/instance/InstanceHandler.java?rev=1326271&r1=1326270&r2=1326271&view=diff
==============================================================================
--- 
felix/trunk/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/instance/InstanceHandler.java
 (original)
+++ 
felix/trunk/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/instance/InstanceHandler.java
 Sun Apr 15 08:28:52 2012
@@ -258,7 +258,7 @@ public class InstanceHandler extends Com
             }
 
             Properties instanceConfiguration = new Properties();
-             instanceConfiguration.putAll(conf);
+            instanceConfiguration.putAll(conf);
             instanceConfiguration.putAll(toAppend);
             m_configurations[i] = new 
ManagedConfiguration(instanceConfiguration);
         }
@@ -276,7 +276,7 @@ public class InstanceHandler extends Com
         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");