| commit | 2bd16ae47a6f6337ca87ac14e6d415d510b59129 | [log] [tgz] |
|---|---|---|
| author | Clement Escoffier <clement@apache.org> | Wed Oct 29 14:35:14 2008 +0000 |
| committer | Clement Escoffier <clement@apache.org> | Wed Oct 29 14:35:14 2008 +0000 |
| tree | b03df8d98d48bcfd369ec4b29003a37f6e7d2819 | |
| parent | 2b7eba9b4463122e815331900c7c993f28005ed0 [diff] |
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. git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@708917 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/instance/InstanceHandlerDescription.java b/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/instance/InstanceHandlerDescription.java index 2be1122..3481ff5 100644 --- a/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/instance/InstanceHandlerDescription.java +++ b/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/instance/InstanceHandlerDescription.java
@@ -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); }
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/architecture/InstanceDescription.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/architecture/InstanceDescription.java index 3ebb43a..02df5e0 100644 --- a/ipojo/core/src/main/java/org/apache/felix/ipojo/architecture/InstanceDescription.java +++ b/ipojo/core/src/main/java/org/apache/felix/ipojo/architecture/InstanceDescription.java
@@ -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;