From d63ee83f1f241c43bc159a54fac24946bf43a85d Mon Sep 17 00:00:00 2001 From: slaws Date: Mon, 3 Aug 2009 13:13:10 +0000 Subject: Test for unique binding names across a service's bindings. Not just the bindings of the same type. Raise an error if the binding names are not unique. Required for ASM_9002. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@800351 13f79535-47bb-0310-9956-ffa450edef68 --- .../sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'java/sca') diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java index e15270911b..e2389c28b2 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java @@ -312,12 +312,9 @@ public class CompositeBindingURIBuilderImpl extends BaseBuilderImpl implements C // Skip the current binding continue; } - if (!binding.getType().equals(otherBinding.getType())) { - // Look for a binding of the same type - continue; - } + if (binding.getName().equals(otherBinding.getName())) { - warning(monitor, contract instanceof Service ? "MultipleBindingsForService" + error(monitor, contract instanceof Service ? "MultipleBindingsForService" : "MultipleBindingsForReference", binding, contract.getName(), binding.getName()); } } -- cgit v1.2.3