Raise an error if two composites with the same name are found (ASM_6001). Also remove code marked with FIXME that causes composites to be added twice under normal conditions.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@805398 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 2 insertions, 2 deletions

diff --git a/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java b/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
index 8c4ebabe79..e81e244458 100644
--- a/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
+++ b/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
@@ -318,8 +318,7 @@ public class NodeFactoryImpl extends NodeFactory {
             attached = true;
         }
         contribution.getDeployables().add(composite);
-        // REVIEW: Is it needed?
-        contribution.getModelResolver().addModel(composite);
+
         return attached;
     }
 
@@ -541,6 +540,7 @@ public class NodeFactoryImpl extends NodeFactory {
             for (Composite composite : contribution.getDeployables()) {
                 // Include the node composite in the top-level composite
                 tempComposite.getIncludes().add(composite);
+                logger.log(Level.INFO, "Adding composite: " + composite.getName() + " to domain");
             }
         }