summaryrefslogtreecommitdiffstats
path: root/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-http
diff options
context:
space:
mode:
authornash <nash@13f79535-47bb-0310-9956-ffa450edef68>2010-08-24 19:12:29 +0000
committernash <nash@13f79535-47bb-0310-9956-ffa450edef68>2010-08-24 19:12:29 +0000
commit06942a3a38de5bf28302ccbf79dc83552ecf7d96 (patch)
tree5f6cc12f71d43ecd17838a3bdeb7e839d85363f0 /sca-java-1.x/branches/sca-java-1.6.1/modules/binding-http
parent7d0186bd737c4fa1ac2dbce6ba1aee1a8fd54216 (diff)
Merge revision 921286 from trunk into the 1.6.1 branch
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@988675 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-1.x/branches/sca-java-1.6.1/modules/binding-http')
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java
index cdd5c0d992..03c0db87f3 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java
@@ -102,7 +102,7 @@ public class HTTPBindingProcessor extends BaseStAXArtifactProcessor implements S
httpBinding.setName(name);
}
- String uri = getString(reader, URI);
+ String uri = getURIString(reader, URI);
if (uri != null) {
httpBinding.setURI(uri);
}