Fix TUSCANY-2486 and TUSCANY-2324

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

1 files changed, 6 insertions, 0 deletions

diff --git a/branches/sca-java-1.3/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java b/branches/sca-java-1.3/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java
index 407877c36d..d2e2e9eb34 100644
--- a/branches/sca-java-1.3/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java
+++ b/branches/sca-java-1.3/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java
@@ -151,13 +151,19 @@ public class WSDLServiceGenerator {
                                                         AbstractContract contract,
                                                         Monitor monitor) {
 
+        //[nash] changes to the builder sequence avoid calling this for a CompositeService
+        assert !(contract instanceof CompositeService);
+        /*
         // For every promoted composite service, the underlying component
         // gets a copy of the service with the name prefixed by "$promoted$."
         String contractName = (contract instanceof CompositeService ? "$promoted$." : "") + contract.getName();
+        */
+        String contractName = contract.getName();
 
         List<Port> ports = new ArrayList<Port>();
         WSDLDefinition wsdlDefinition = wsBinding.getWSDLDefinition();
         if (wsdlDefinition == null) {
+            error(monitor, "NoWsdlInterface", wsBinding, component.getName(), contract.getName());
             return null;
         }
         Definition def = wsdlDefinition.getDefinition();