You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by na...@apache.org on 2011/03/31 21:48:59 UTC
svn commit: r1087424 - in /tuscany/sca-java-1.x/branches/sca-java-1.6.2/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2: Axis2ServiceInMessageReceiver.java Axis2ServiceInOutSyncMessageReceiver.java Axis2ServiceProvider.java

Author: nash
Date: Thu Mar 31 19:48:59 2011
New Revision: 1087424

URL: http://svn.apache.org/viewvc?rev=1087424&view=rev
Log:
TUSCANY-3822: call PolicyHandler.afterInvoke() with outbound MessageContext containing response message

Modified:
    tuscany/sca-java-1.x/branches/sca-java-1.6.2/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInMessageReceiver.java
    tuscany/sca-java-1.x/branches/sca-java-1.6.2/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java
    tuscany/sca-java-1.x/branches/sca-java-1.6.2/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java

Modified: tuscany/sca-java-1.x/branches/sca-java-1.6.2/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInMessageReceiver.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.2/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInMessageReceiver.java?rev=1087424&r1=1087423&r2=1087424&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.2/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInMessageReceiver.java (original)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.2/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInMessageReceiver.java Thu Mar 31 19:48:59 2011
@@ -65,6 +65,11 @@ public class Axis2ServiceInMessageReceiv
             }
             */
 
+            // TUSCANY-3822: moved afterInvoke() call from Axis2ServiceProvider           
+            for ( PolicyHandler policyHandler : policyHandlerList ) {
+                policyHandler.afterInvoke(null, inMC);
+            }        
+
         } catch (InvocationTargetException e) {
             Throwable t = e.getCause();
             if (t instanceof Exception) {

Modified: tuscany/sca-java-1.x/branches/sca-java-1.6.2/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.2/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java?rev=1087424&r1=1087423&r2=1087424&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.2/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java (original)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.2/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java Thu Mar 31 19:48:59 2011
@@ -80,6 +80,12 @@ public class Axis2ServiceInOutSyncMessag
                 soapEnvelope.getBody().addChild(responseOM);
             }
             outMC.setEnvelope(soapEnvelope);
+
+            // TUSCANY-3822: moved afterInvoke() call from Axis2ServiceProvider           
+            for ( PolicyHandler policyHandler : policyHandlerList ) {
+                policyHandler.afterInvoke(responseOM, outMC);
+            }        
+
             outMC.getOperationContext().setProperty(Constants.RESPONSE_WRITTEN, Constants.VALUE_TRUE);
 
         } catch (InvocationTargetException e) {

Modified: tuscany/sca-java-1.x/branches/sca-java-1.6.2/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.2/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java?rev=1087424&r1=1087423&r2=1087424&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.2/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java (original)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.2/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java Thu Mar 31 19:48:59 2011
@@ -765,9 +765,8 @@ public class Axis2ServiceProvider {
         RuntimeWire wire = ((RuntimeComponentService)contract).getRuntimeWire(getBinding());
         Object response =  wire.invoke(op, msg);
         
-        for ( PolicyHandler policyHandler : policyHandlerList ) {
-            policyHandler.afterInvoke(response, inMC);
-        }        
+        // TUSCANY-3822: moved afterInvoke() call to Axis2ServiceInOutSyncMessageReceiver
+        // and Axis2ServiceInMessageReceiver
         
         return response;
     }