Author: dkulp
Date: Fri Apr 2 02:03:28 2010
New Revision: 930149
URL: http://svn.apache.org/viewvc?rev=930149&view=rev
Log:
Merged revisions 930148 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r930148 | dkulp | 2010-04-01 22:00:57 -0400 (Thu, 01 Apr 2010) | 2 lines
[CXF-2630] Remove line that should have removed before to get
TaskExecutor stuff working with spring3
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java?rev=930149&r1=930148&r2=930149&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java
Fri Apr 2 02:03:28 2010
@@ -248,7 +248,6 @@ public final class JMSFactory {
}
if (jmsConfig.getTaskExecutor() != null) {
setTaskExecutor(jmsListener, jmsConfig.getTaskExecutor());
- jmsListener.setTaskExecutor(jmsConfig.getTaskExecutor());
}
if (jmsConfig.isAutoResolveDestination()) {
