BWS_2018 - add a check that uri doesn't appear on a service callback binding.ws element

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

1 files changed, 5 insertions, 0 deletions

diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java b/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
index 6f5b84dd56..3cf109c8cf 100644
--- a/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
+++ b/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
@@ -467,11 +467,16 @@ public class CompositeProcessor extends BaseAssemblyProcessor implements StAXArt
                             // Read a <callback>
                             callback = assemblyFactory.createCallback();
                             contract.setCallback(callback);
+                            callback.setParentContract(contract);
 
                             //handle extension attributes
                             this.readExtendedAttributes(reader, name, callback, extensionAttributeProcessor, context);
 
                             policyProcessor.readPolicies(callback, reader);
+                            
+                            // set the parent model so that binding processing can 
+                            // detect it they're being read as part of a callback 
+                            context.setParentModel(callback);                            
 
                         } else if (IMPLEMENTATION_COMPOSITE_QNAME.equals(name)) {