Author: dkulp Date: Fri May 11 17:51:45 2012 New Revision: 1337315 URL: http://svn.apache.org/viewvc?rev=1337315&view=rev Log: Merged revisions 1337304 via svn merge from https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes
........ r1337304 | dkulp | 2012-05-11 13:41:22 -0400 (Fri, 11 May 2012) | 18 lines Merged revisions 1337296 via svn merge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes ........ r1337296 | dkulp | 2012-05-11 13:38:03 -0400 (Fri, 11 May 2012) | 10 lines Merged revisions 1337214 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1337214 | dkulp | 2012-05-11 11:41:52 -0400 (Fri, 11 May 2012) | 3 lines [CXF-4312] Remove setting the default executor in the JAX-WS service objects so the transports can do something "smart" if they can. ........ ........ ........ Modified: cxf/branches/2.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java?rev=1337315&r1=1337314&r2=1337315&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java (original) +++ cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java Fri May 11 17:51:45 2012 @@ -93,7 +93,6 @@ import org.apache.cxf.tools.common.exten import org.apache.cxf.tools.util.URIParserUtil; import org.apache.cxf.transport.DestinationFactory; import org.apache.cxf.transport.DestinationFactoryManager; -import org.apache.cxf.workqueue.OneShotAsyncExecutor; import org.apache.cxf.ws.addressing.EndpointReferenceType; import org.apache.cxf.ws.addressing.VersionTransformer; import org.apache.cxf.wsdl.EndpointReferenceUtils; @@ -466,15 +465,6 @@ public class ServiceImpl extends Service // Configure the Service Service service = serviceFactory.getService(); - service.setExecutor(new Executor() { - public void execute(Runnable command) { - Executor ex = getExecutor(); - if (ex == null) { - ex = OneShotAsyncExecutor.getInstance(); - } - ex.execute(command); - } - }); configureObject(service); // Configure the JaxWsEndpoitnImpl
