summaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2009-10-06 10:28:52 +0000
committerslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2009-10-06 10:28:52 +0000
commitf1bea784df350e89fad47ab040bc77cba43ea3bc (patch)
tree2fca2b773c40fb9b673686ae69d85a2926d74586 /java
parentba3cc10f94e2e94fd6a3304130ccb6ee8a535915 (diff)
Correct duplicate component test
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@822199 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
-rw-r--r--java/sca/itest/nodes/two-nodes-two-vms-test/pom.xml8
-rw-r--r--java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeComponentTypeBuilderImpl.java2
2 files changed, 8 insertions, 2 deletions
diff --git a/java/sca/itest/nodes/two-nodes-two-vms-test/pom.xml b/java/sca/itest/nodes/two-nodes-two-vms-test/pom.xml
index e65aac9666..f503c1792d 100644
--- a/java/sca/itest/nodes/two-nodes-two-vms-test/pom.xml
+++ b/java/sca/itest/nodes/two-nodes-two-vms-test/pom.xml
@@ -31,6 +31,11 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-endpoint-tribes</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>itest-nodes-helloworld-iface</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
@@ -63,7 +68,8 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-jetty</artifactId>
<version>2.0-SNAPSHOT</version>
- </dependency>
+ </dependency>
+
</dependencies>
<build>
diff --git a/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeComponentTypeBuilderImpl.java b/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeComponentTypeBuilderImpl.java
index f0889f3a2f..d0bc098fbe 100644
--- a/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeComponentTypeBuilderImpl.java
+++ b/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeComponentTypeBuilderImpl.java
@@ -105,7 +105,7 @@ public class CompositeComponentTypeBuilderImpl {
for (Component component : composite.getComponents()) {
// Check for duplicate component names
- if (composite.getComponent(component.getName()) == null) {
+ if (component != composite.getComponent(component.getName())) {
Monitor.error(monitor,
this,
Messages.ASSEMBLY_VALIDATION,