summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.5.1
diff options
context:
space:
mode:
authornash <nash@13f79535-47bb-0310-9956-ffa450edef68>2009-08-23 22:23:23 +0000
committernash <nash@13f79535-47bb-0310-9956-ffa450edef68>2009-08-23 22:23:23 +0000
commit5dff01a799625207fd7682fe188eba9fda9daf99 (patch)
tree5324952f0c87856250ba86b074f371343225d611 /branches/sca-java-1.5.1
parent7173ddb389d9e447ab57c8419668c12751512ee5 (diff)
Update fix to TUSCANY-3193 to prevent host/port information being added to a URI more than once
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@807024 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-java-1.5.1')
-rw-r--r--branches/sca-java-1.5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingConfigurationUtil.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/branches/sca-java-1.5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingConfigurationUtil.java b/branches/sca-java-1.5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingConfigurationUtil.java
index 2765d1bb90..2842ae82bb 100644
--- a/branches/sca-java-1.5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingConfigurationUtil.java
+++ b/branches/sca-java-1.5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingConfigurationUtil.java
@@ -81,8 +81,10 @@ abstract class BindingConfigurationUtil {
&& targetNodeBinding != sourceNodeBinding) {
if (!isCallback) {
serviceBinding.setURI(targetNodeBinding.getURI() + serviceBinding.getURI());
+ bindingMap.remove(serviceBinding); // don't add this again
} else {
binding.setURI(sourceNodeBinding.getURI() + binding.getURI());
+ bindingMap.remove(binding); // don't add this again
}
}
}