svn commit: r1307439 - /cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java

[dkulp]

Author: dkulp
Date: Fri Mar 30 14:25:58 2012
New Revision: 1307439

URL: http://svn.apache.org/viewvc?rev=1307439&view=rev
Log:
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.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java

Modified: 
cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=1307439&r1=1307438&r2=1307439&view=diff
==============================================================================
--- 
cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
 (original)
+++ 
cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
 Fri Mar 30 14:25:58 2012
@@ -1519,7 +1519,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);