cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1186394 - in /cxf/branches/2.4.x-fixes: ./ rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java
Date Wed, 19 Oct 2011 18:49:37 GMT
Author: dkulp
Date: Wed Oct 19 18:49:37 2011
New Revision: 1186394

URL: http://svn.apache.org/viewvc?rev=1186394&view=rev
Log:
Merged revisions 1185751 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1185751 | dkulp | 2011-10-18 12:47:47 -0400 (Tue, 18 Oct 2011) | 2 lines
  
  Very minor performance thing to not create an object that is immediately
  discarded in some cases.
........

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/HTTPTransportFactory.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/HTTPTransportFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java?rev=1186394&r1=1186393&r2=1186394&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java
Wed Oct 19 18:49:37 2011
@@ -269,10 +269,11 @@ public class HTTPTransportFactory 
                 LOG.log(Level.SEVERE, m);
                 throw new IOException(m);
             }
-            HttpDestinationFactory servletFactory = new ServletDestinationFactory();
-            HttpDestinationFactory factory = servletFactory;
+            HttpDestinationFactory factory = null;
             if (jettyFactory != null && (addr == null || addr.startsWith("http")))
{
                 factory = jettyFactory;
+            } else {
+                factory = new ServletDestinationFactory();
             }
             
             d = factory.createDestination(endpointInfo, getBus(), registry);



Mime
View raw message