Author: alessio.soldano(a)jboss.com Date: 2008-11-28 08:48:45 -0500 (Fri, 28 Nov 2008) New Revision: 8816 Modified: container/jboss50/branches/jboss500CR2/src/main/java/org/jboss/wsf/container/jboss50/invocation/WebServiceContextFactoryImpl.java Log: [JBWS-2257] Getting the provided WebServiceContext in the container integration through the MessageContext Modified: container/jboss50/branches/jboss500CR2/src/main/java/org/jboss/wsf/container/jboss50/invocation/WebServiceContextFactoryImpl.java =================================================================== --- container/jboss50/branches/jboss500CR2/src/main/java/org/jboss/wsf/container/jboss50/invocation/WebServiceContextFactoryImpl.java 2008-11-28 13:38:50 UTC (rev 8815) +++ container/jboss50/branches/jboss500CR2/src/main/java/org/jboss/wsf/container/jboss50/invocation/WebServiceContextFactoryImpl.java 2008-11-28 13:48:45 UTC (rev 8816) @@ -23,6 +23,7 @@ import org.jboss.wsf.spi.invocation.*; +import javax.xml.ws.WebServiceContext; import javax.xml.ws.handler.MessageContext; /** @@ -35,7 +36,11 @@ { ExtensibleWebServiceContext context = null; - if(type.toString().indexOf("EJB")!=-1 || type.toString().indexOf("MDB")!=-1) + //checking for a provided WebServiceContext in the MessageContext; to be removed after EJBTHREE-1604 + WebServiceContext providedContext = (WebServiceContext)messageContext.get(WebServiceContext.class.toString()); + if (providedContext != null) + context = new WebServiceContextDelegate(providedContext); + else if(type.toString().indexOf("EJB")!=-1 || type.toString().indexOf("MDB")!=-1) context = new WebServiceContextEJB(messageContext); else context = new WebServiceContextJSE(messageContext);