[jbossws-commits] JBossWS SVN: r10061 - in stack/cxf/branches/jbossws-cxf-3.1.2/modules: server/src/main/java/org/jboss/wsf/stack/cxf and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2009-05-19 06:03:34 -0400 (Tue, 19 May 2009)
New Revision: 10061

Modified:
   stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java
   stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java
Log:
sync with trunk

Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java	2009-05-19 09:34:55 UTC (rev 10060)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java	2009-05-19 10:03:34 UTC (rev 10061)
@@ -87,6 +87,8 @@
    {
       try
       {
+         BusFactory.setThreadDefaultBus(null); // cleanup thread locals before constructing Service
+
          Reference ref = (Reference)obj;
 
          // Get the target class name
@@ -121,8 +123,6 @@
          // Get the URL to the wsdl
          URL wsdlURL = serviceRef.getWsdlLocation();
 
-         BusFactory.setThreadDefaultBus(null); // cleanup thread locals before constructing Service
-
          // Generic javax.xml.ws.Service
          if (serviceClass == Service.class)
          {

Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java	2009-05-19 09:34:55 UTC (rev 10060)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java	2009-05-19 10:03:34 UTC (rev 10061)
@@ -33,6 +33,7 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.xml.ws.WebServiceException;
 
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.transport.servlet.CXFServlet;
 import org.apache.cxf.transport.servlet.ServletController;
 import org.apache.cxf.transport.servlet.ServletTransportFactory;
@@ -129,6 +130,7 @@
    {
       try
       {
+         BusFactory.setThreadDefaultBus(getBus());
          EndpointAssociation.setEndpoint(endpoint);
          RequestHandler requestHandler = (RequestHandler)endpoint.getRequestHandler();
          requestHandler.handleHttpRequest(endpoint, req, res, getServletContext());
@@ -136,6 +138,7 @@
       finally
       {
          EndpointAssociation.removeEndpoint();
+         BusFactory.setThreadDefaultBus(null);
       }
    }