diff options
author | bdaniel <bdaniel@13f79535-47bb-0310-9956-ffa450edef68> | 2009-06-26 20:42:30 +0000 |
---|---|---|
committer | bdaniel <bdaniel@13f79535-47bb-0310-9956-ffa450edef68> | 2009-06-26 20:42:30 +0000 |
commit | 31065243a33e6027752b858666ff23c24b3465af (patch) | |
tree | d16abc973a992a672528970c506158c1fa68daf0 /branches/sca-java-1.x/modules/binding-http-runtime/src/main/java/org/apache | |
parent | 55efe51ad85a25f50e45a3f80fc89076910b8ad4 (diff) |
TUSCANY-3124 Check for wireFormat/operationSelector before other operations
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@788863 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-java-1.x/modules/binding-http-runtime/src/main/java/org/apache')
-rw-r--r-- | branches/sca-java-1.x/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/branches/sca-java-1.x/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java b/branches/sca-java-1.x/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java index 3a3428268c..8e84d04b76 100644 --- a/branches/sca-java-1.x/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java +++ b/branches/sca-java-1.x/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java @@ -133,7 +133,11 @@ public class HTTPServiceBindingProvider implements ServiceBindingProviderRRB { for (InvocationChain invocationChain : wire.getInvocationChains()) { Operation operation = invocationChain.getTargetOperation(); String operationName = operation.getName(); - if (operationName.equals("get")) { + if (binding.getOperationSelector() != null || binding.getRequestWireFormat() != null) { + Invoker bindingInvoker = wire.getBindingInvocationChain().getHeadInvoker(); + servlet = new HTTPRRBListenerServlet(binding, bindingInvoker, messageFactory); + break; + } else if (operationName.equals("get")) { Invoker getInvoker = invocationChain.getHeadInvoker(); bindingListenerServlet.setGetInvoker(getInvoker); servlet = bindingListenerServlet; @@ -169,11 +173,7 @@ public class HTTPServiceBindingProvider implements ServiceBindingProviderRRB { Invoker serviceInvoker = invocationChain.getHeadInvoker(); servlet = new HTTPServiceListenerServlet(binding, serviceInvoker, messageFactory); break; - } else if (binding.getOperationSelector() != null || binding.getRequestWireFormat() != null) { - Invoker bindingInvoker = wire.getBindingInvocationChain().getHeadInvoker(); - servlet = new HTTPRRBListenerServlet(binding, bindingInvoker, messageFactory); - break; - } + } } if (servlet == null) { throw new IllegalStateException("No get or service method found on the service"); |