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/03/29 21:07:09 UTC

svn commit: r1307061 - /cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java

Author: dkulp
Date: Thu Mar 29 19:07:09 2012
New Revision: 1307061

URL: http://svn.apache.org/viewvc?rev=1307061&view=rev
Log:
Check if the http-conduit workqueue is null before grabbing the default

Modified:
    cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java

Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=1307061&r1=1307060&r2=1307061&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java (original)
+++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java Thu Mar 29 19:07:09 2012
@@ -1538,7 +1538,9 @@ public class HTTPConduit 
                         WorkQueueManager mgr = outMessage.getExchange().get(Bus.class)
                             .getExtension(WorkQueueManager.class);
                         AutomaticWorkQueue qu = mgr.getNamedWorkQueue("http-conduit");
-                        qu = mgr.getAutomaticWorkQueue();
+                        if (qu == null) {
+                            qu = mgr.getAutomaticWorkQueue();
+                        }
                         qu.execute(runnable, 5000);
                     } else {
                         outMessage.getExchange().put(Executor.class.getName()