felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clem...@apache.org
Subject svn commit: r708917 - in /felix/trunk/ipojo: composite/src/main/java/org/apache/felix/ipojo/composite/instance/InstanceHandlerDescription.java core/src/main/java/org/apache/felix/ipojo/architecture/InstanceDescription.java
Date Wed, 29 Oct 2008 14:35:15 GMT
Author: clement
Date: Wed Oct 29 07:35:14 2008
New Revision: 708917

URL: http://svn.apache.org/viewvc?rev=708917&view=rev
Log:
Fix issue Felix-797.
When the arch command introspects an iPOJO composite instance, contained instances were displayed
several times. Moreover, there was a redundancy between the instance handler description and
the contained instance part of the composite structure description. Instances are described
twice.

Modified:
    felix/trunk/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/instance/InstanceHandlerDescription.java
    felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/architecture/InstanceDescription.java

Modified: felix/trunk/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/instance/InstanceHandlerDescription.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/instance/InstanceHandlerDescription.java?rev=708917&r1=708916&r2=708917&view=diff
==============================================================================
--- felix/trunk/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/instance/InstanceHandlerDescription.java
(original)
+++ felix/trunk/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/instance/InstanceHandlerDescription.java
Wed Oct 29 07:35:14 2008
@@ -80,7 +80,8 @@
                         break;
                 }
                 instance.addAttribute(new Attribute("State", state));
-                instance.addElement(inst.getInstance().getInstanceDescription().getDescription());
+                // The instance description is already contained inside parent instance description.
+                //instance.addElement(inst.getInstance().getInstanceDescription().getDescription());
             }
             instances.addElement(instance);
         }

Modified: felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/architecture/InstanceDescription.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/architecture/InstanceDescription.java?rev=708917&r1=708916&r2=708917&view=diff
==============================================================================
--- felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/architecture/InstanceDescription.java
(original)
+++ felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/architecture/InstanceDescription.java
Wed Oct 29 07:35:14 2008
@@ -235,8 +235,8 @@
             Element inst = new Element("ContainedInstances", "");
             for (int i = 0; i < m_containedInstances.length; i++) {
                 inst.addElement(m_containedInstances[i].getDescription());
-                instance.addElement(inst);
             }
+            instance.addElement(inst);
         }
         return instance;
 



Mime
View raw message