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

[cl...@apache.org]

Author: clement
Date: Mon Sep 26 14:16:47 2011
New Revision: 1175879

URL: http://svn.apache.org/viewvc?rev=1175879&view=rev
Log:
Fixed FELIX-3130.

The instance handler must not try to instantiate the composite from where it came. The instance configuration didn't ignore the 'component' attribute correctly.

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=1175879&r1=1175878&r2=1175879&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 Mon Sep 26 14:16:47 2011
@@ -179,8 +179,8 @@ public class InstanceHandler extends Com
         String className = factory.getComponentDescription().getClassName();
         for (int i = 0; i < m_configurations.length; i++) {
             if (m_configurations[i].getInstance() == null
-            		&& (m_configurations[i].getNeededFactoryName().equals(factName)
-            				|| m_configurations[i].getNeededFactoryName().equals(className))) {
+                    && (m_configurations[i].getNeededFactoryName().equals(factName)
+                            || m_configurations[i].getNeededFactoryName().equals(className))) {
                 createInstance(factory, m_configurations[i]);
                 implicated = true;
             }
@@ -239,11 +239,11 @@ public class InstanceHandler extends Com
         Properties toAppend = new Properties();
         Enumeration keys = configuration.keys();
         while(keys.hasMoreElements()) {
-        	String key = (String) keys.nextElement();
-        	if (! key.equals("instance.name")
-        			|| key.equals("component")) { // Remove instance.name and component
-        		toAppend.put(key, configuration.get(key));
-        	}
+            String key = (String) keys.nextElement();
+            if (! (key.equals("instance.name")
+                    || key.equals("component"))) { // Remove instance.name and component
+                toAppend.put(key, configuration.get(key));
+            }
         }
 
         Element[] instances = metadata.getElements("instance");
@@ -257,8 +257,8 @@ public class InstanceHandler extends Com
                 throw new ConfigurationException("An instance cannot be parsed correctly : " + e.getMessage());
             }
 
-        	Properties instanceConfiguration = new Properties();
-         	instanceConfiguration.putAll(conf);
+            Properties instanceConfiguration = new Properties();
+             instanceConfiguration.putAll(conf);
             instanceConfiguration.putAll(toAppend);
             m_configurations[i] = new ManagedConfiguration(instanceConfiguration);
         }
@@ -273,7 +273,7 @@ public class InstanceHandler extends Com
      * @throws ParseException : occurs when a configuration cannot be parse correctly.
      */
     public static Properties parseInstance(Element instance) throws ParseException {
-    	Properties dict = new Properties();
+        Properties dict = new Properties();
         String name = instance.getAttribute("name");
         if (name != null) {
             dict.put("name", name);