svn commit: r800351 - /tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java

[sl...@apache.org]

Author: slaws
Date: Mon Aug  3 13:13:10 2009
New Revision: 800351

URL: http://svn.apache.org/viewvc?rev=800351&view=rev
Log:
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.

Modified:
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java

Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java?rev=800351&r1=800350&r2=800351&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java (original)
+++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java Mon Aug  3 13:13:10 2009
@@ -312,12 +312,9 @@
                 // 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());
             }
         }