Author: richard.opalka(a)jboss.com Date: 2010-11-30 03:23:39 -0500 (Tue, 30 Nov 2010) New Revision: 13364 Modified: stack/native/branches/jbossws-native-3.4.1/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java Log: [JBWS-3171] create WS ctx for EJB3 WS endpoints too Modified: stack/native/branches/jbossws-native-3.4.1/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java =================================================================== --- stack/native/branches/jbossws-native-3.4.1/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2010-11-29 16:32:03 UTC (rev 13363) +++ stack/native/branches/jbossws-native-3.4.1/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2010-11-30 08:23:39 UTC (rev 13364) @@ -333,7 +333,8 @@ CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); if (msgContext instanceof SOAPMessageContextJAXWS) { - if (ep.getService().getDeployment().getType() == DeploymentType.JAXWS_JSE) + final DeploymentType deploymentType = ep.getService().getDeployment().getType(); + if (DeploymentType.JAXWS_JSE == deploymentType) { if (msgContext.get(MessageContext.SERVLET_REQUEST) != null) { @@ -345,6 +346,11 @@ log.warn("Cannot provide WebServiceContext, since the current MessageContext does not provide a ServletRequest"); } } + else if (DeploymentType.JAXWS_EJB3 == deploymentType) + { + WebServiceContext wsContext = contextFactory.newWebServiceContext(InvocationType.JAXWS_EJB3, (SOAPMessageContextJAXWS)msgContext); + invContext.addAttachment(WebServiceContext.class, wsContext); + } invContext.addAttachment(javax.xml.ws.handler.MessageContext.class, msgContext); } if (msgContext instanceof SOAPMessageContextJAXRPC)