[Jboss-cvs] JBossAS SVN: r54975 - trunk/server/src/main/org/jboss/ejb/plugins

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2006-08-01 10:08:32 -0400 (Tue, 01 Aug 2006)
New Revision: 54975

Modified:
   trunk/server/src/main/org/jboss/ejb/plugins/StatelessSessionInstanceInterceptor.java
Log:
preserve in InMethodFlag for JAXWS MessageContext

Modified: trunk/server/src/main/org/jboss/ejb/plugins/StatelessSessionInstanceInterceptor.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/plugins/StatelessSessionInstanceInterceptor.java	2006-08-01 14:02:51 UTC (rev 54974)
+++ trunk/server/src/main/org/jboss/ejb/plugins/StatelessSessionInstanceInterceptor.java	2006-08-01 14:08:32 UTC (rev 54975)
@@ -37,7 +37,6 @@
 import javax.ejb.EJBException;
 import javax.ejb.TimedObject;
 import javax.ejb.Timer;
-import javax.xml.rpc.handler.MessageContext;
 
 /**
  * This container acquires the given instance. This must be used after
@@ -142,6 +141,9 @@
       // Use this context
       mi.setEnterpriseContext(ctx);
 
+      // JAXRPC/JAXWS message context
+      Object msgContext = mi.getValue(InvocationKey.SOAP_MESSAGE_CONTEXT);
+
       // Timer invocation
       if (ejbTimeout.equals(mi.getMethod()))
       {
@@ -149,9 +151,11 @@
       }
 
       // Service Endpoint invocation
-      else if (mi.getValue(InvocationKey.SOAP_MESSAGE_CONTEXT) instanceof MessageContext)
+      else if (msgContext != null)
       {
-         ctx.setMessageContext((MessageContext)mi.getValue(InvocationKey.SOAP_MESSAGE_CONTEXT));
+         if (msgContext instanceof javax.xml.rpc.handler.MessageContext)
+            ctx.setMessageContext((javax.xml.rpc.handler.MessageContext)msgContext);
+
          AllowedOperationsAssociation.pushInMethodFlag(IN_SERVICE_ENDPOINT_METHOD);
       }