diff options
| author | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2010-12-23 13:02:14 +0000 |
|---|---|---|
| committer | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2010-12-23 13:02:14 +0000 |
| commit | 47140fa8d10c952f94c58116973904a4e38ef271 (patch) | |
| tree | 6cfe929a99a230ed5a007b5d5aeb96e0f2f182c8 /sca-java-2.x/trunk/modules | |
| parent | e2ba93b52c0cfbf29e2f61fa584a4a0038cefc69 (diff) | |
Correct the order that the phase constants appear in to match the actual phase order and make the local binding.sca optimization link to the head of the service operation wire.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1052253 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/modules')
2 files changed, 2 insertions, 2 deletions
diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingInvoker.java b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingInvoker.java index 8ea754c8fc..3639ee9062 100644 --- a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingInvoker.java +++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingInvoker.java @@ -61,7 +61,7 @@ public class SCABindingInvoker extends InterceptorAsyncImpl { * @see org.apache.tuscany.sca.invocation.Interceptor#getNext() */ public Invoker getNext() { - return chain.getHeadInvoker(Phase.SERVICE_POLICY); + return chain.getHeadInvoker(Phase.SERVICE_INTERFACE); } /** diff --git a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java index 8bb81b7eda..4f81b763c7 100644 --- a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java +++ b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java @@ -52,8 +52,8 @@ public interface Phase { // Service operation chains String SERVICE_BINDING = "service.binding"; // The first phase for incoming invocations via a service - String SERVICE_POLICY = "service.policy"; // service policy handling String SERVICE_INTERFACE = "service.interface"; // data validation and transformation + String SERVICE_POLICY = "service.policy"; // service policy handling String SERVICE = "component.service"; // TODO: not sure if we need to have this phase String IMPLEMENTATION_POLICY = "implementation.policy"; // implementation policy handling String IMPLEMENTATION = "component.implementation"; // implementation invoker |