Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 84412 invoked from network); 8 Sep 2008 15:43:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 8 Sep 2008 15:43:44 -0000 Received: (qmail 1734 invoked by uid 500); 8 Sep 2008 15:43:42 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 1695 invoked by uid 500); 8 Sep 2008 15:43:42 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 1686 invoked by uid 99); 8 Sep 2008 15:43:42 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Sep 2008 08:43:42 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Sep 2008 15:42:52 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8D658238889B; Mon, 8 Sep 2008 08:42:53 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r693137 - /geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBMethodInvoker.java Date: Mon, 08 Sep 2008 15:42:52 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080908154253.8D658238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gawor Date: Mon Sep 8 08:42:52 2008 New Revision: 693137 URL: http://svn.apache.org/viewvc?rev=693137&view=rev Log: quick fix to get trunk building again Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBMethodInvoker.java Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBMethodInvoker.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBMethodInvoker.java?rev=693137&r1=693136&r2=693137&view=diff ============================================================================== --- geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBMethodInvoker.java (original) +++ geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBMethodInvoker.java Mon Sep 8 08:42:52 2008 @@ -26,13 +26,14 @@ import javax.interceptor.InvocationContext; import javax.xml.ws.handler.MessageContext; +import javax.xml.ws.handler.MessageContext.Scope; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cxf.Bus; import org.apache.cxf.interceptor.Fault; import org.apache.cxf.jaxws.context.WebServiceContextImpl; -import org.apache.cxf.jaxws.support.ContextPropertiesMapping; +import org.apache.cxf.jaxws.context.WrappedMessageContext; import org.apache.cxf.message.Exchange; import org.apache.cxf.message.FaultMode; import org.apache.cxf.service.invoker.AbstractInvoker; @@ -80,7 +81,7 @@ Method method, List params) { - MessageContext ctx = ContextPropertiesMapping.createWebServiceContext(exchange); + MessageContext ctx = new WrappedMessageContext(exchange.getInMessage(), Scope.APPLICATION); WebServiceContextImpl.setMessageContext(ctx); try { @@ -155,8 +156,8 @@ invContext.setParameters(paramArray); Object res = invContext.proceed(); - ContextPropertiesMapping.updateWebServiceContext(exchange, - (MessageContext)invContext.getContextData()); +// ContextPropertiesMapping.updateWebServiceContext(exchange, +// (MessageContext)invContext.getContextData()); return res; }