You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2010/12/23 14:02:15 UTC

svn commit: r1052253 - in /tuscany/sca-java-2.x/trunk/modules: binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingInvoker.java core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java

Author: slaws
Date: Thu Dec 23 13:02:14 2010
New Revision: 1052253

URL: http://svn.apache.org/viewvc?rev=1052253&view=rev
Log:
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.

Modified:
    tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingInvoker.java
    tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java

Modified: tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingInvoker.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingInvoker.java?rev=1052253&r1=1052252&r2=1052253&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingInvoker.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingInvoker.java Thu Dec 23 13:02:14 2010
@@ -61,7 +61,7 @@ public class SCABindingInvoker extends I
      * @see org.apache.tuscany.sca.invocation.Interceptor#getNext()
      */
     public Invoker getNext() {
-        return chain.getHeadInvoker(Phase.SERVICE_POLICY);
+        return chain.getHeadInvoker(Phase.SERVICE_INTERFACE);
     }
 
     /**

Modified: tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java?rev=1052253&r1=1052252&r2=1052253&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java Thu Dec 23 13:02:14 2010
@@ -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