You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/04/06 18:34:43 UTC
svn commit: r1310454 - in /cxf/branches/2.4.x-fixes: ./
rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
Author: dkulp
Date: Fri Apr 6 16:34:43 2012
New Revision: 1310454
URL: http://svn.apache.org/viewvc?rev=1310454&view=rev
Log:
Merged revisions 1307439 via svn merge from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........
r1307439 | dkulp | 2012-03-30 10:25:58 -0400 (Fri, 30 Mar 2012) | 9 lines
Merged revisions 1307061 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1307061 | dkulp | 2012-03-29 15:07:09 -0400 (Thu, 29 Mar 2012) | 2 lines
Check if the http-conduit workqueue is null before grabbing the default
........
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=1310454&r1=1310453&r2=1310454&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java (original)
+++ cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java Fri Apr 6 16:34:43 2012
@@ -1518,7 +1518,7 @@ public class HTTPConduit
WorkQueueManager mgr = outMessage.getExchange().get(Bus.class)
.getExtension(WorkQueueManager.class);
AutomaticWorkQueue qu = mgr.getNamedWorkQueue("http-conduit");
- if (ex == null) {
+ if (qu == null) {
qu = mgr.getAutomaticWorkQueue();
}
qu.execute(runnable, 5000);