You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2009/04/21 19:03:26 UTC
svn commit: r767225 - in /openejb/trunk/openejb3/container/openejb-core/src: main/java/org/apache/openejb/core/stateless/ test/java/org/apache/openejb/core/stateless/

Author: dblevins
Date: Tue Apr 21 17:03:25 2009
New Revision: 767225

URL: http://svn.apache.org/viewvc?rev=767225&view=rev
Log:
Move the web service interceptor to the outside of the stack so handler chains run before interceptors

Modified:
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainer.java
    openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxRpcInvocationTest.java
    openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxWsInvocationTest.java

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainer.java?rev=767225&r1=767224&r2=767225&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainer.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainer.java Tue Apr 21 17:03:25 2009
@@ -263,8 +263,8 @@
             InterceptorData providerData = new InterceptorData(interceptor.getClass());
             ClassFinder finder = new ClassFinder(interceptor.getClass());
             providerData.getAroundInvoke().addAll(finder.findAnnotatedMethods(AroundInvoke.class));
-            interceptorDatas.add(providerData);
-//            interceptorDatas.add(0, providerData);
+//            interceptorDatas.add(providerData);
+            interceptorDatas.add(0, providerData);
         }
 
         InterceptorStack interceptorStack = new InterceptorStack(instance.bean, runMethod, Operation.BUSINESS_WS, interceptorDatas, interceptors);

Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxRpcInvocationTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxRpcInvocationTest.java?rev=767225&r1=767224&r2=767225&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxRpcInvocationTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxRpcInvocationTest.java Tue Apr 21 17:03:25 2009
@@ -125,13 +125,13 @@
     }
 
     public static enum Call {
+        WebServiceProvider_Invoke_BEFORE,
         EjbInterceptor_Invoke_BEFORE,
         Bean_Invoke_BEFORE,
-        WebServiceProvider_Invoke_BEFORE,
         Bean_Invoke,
-        WebServiceProvider_Invoke_AFTER,
         Bean_Invoke_AFTER,
         EjbInterceptor_Invoke_AFTER,
+        WebServiceProvider_Invoke_AFTER,
     }
 
     public static List<Call> calls = new ArrayList<Call>();

Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxWsInvocationTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxWsInvocationTest.java?rev=767225&r1=767224&r2=767225&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxWsInvocationTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxWsInvocationTest.java Tue Apr 21 17:03:25 2009
@@ -131,13 +131,13 @@
     }
 
     public static enum Call {
+        WebServiceProvider_Invoke_BEFORE,
         EjbInterceptor_Invoke_BEFORE,
         Bean_Invoke_BEFORE,
-        WebServiceProvider_Invoke_BEFORE,
         Bean_Invoke,
-        WebServiceProvider_Invoke_AFTER,
         Bean_Invoke_AFTER,
         EjbInterceptor_Invoke_AFTER,
+        WebServiceProvider_Invoke_AFTER,
     }
 
     public static List<Call> calls = new ArrayList<Call>();