You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2008/09/08 17:42:52 UTC

svn commit: r693137 - /geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBMethodInvoker.java

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<Object> 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;
     }