Author: dkulp Date: Wed Mar 14 13:34:25 2012 New Revision: 1300539 URL: http://svn.apache.org/viewvc?rev=1300539&view=rev Log: Merged revisions 1300536 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
................ r1300536 | dkulp | 2012-03-14 09:20:05 -0400 (Wed, 14 Mar 2012) | 9 lines Merged revisions 1300518 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1300518 | dkulp | 2012-03-14 08:06:48 -0400 (Wed, 14 Mar 2012) | 1 line Fix typo. :-) ........ ................ Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Mar 14 13:34:25 2012 @@ -1,2 +1,2 @@ -/cxf/branches/2.5.x-fixes:1299092,1299637,1299725,1300270,1300343 -/cxf/trunk:1298830,1299635,1299682,1300342 +/cxf/branches/2.5.x-fixes:1299092,1299637,1299725,1300270,1300343,1300536 +/cxf/trunk:1298830,1299635,1299682,1300342,1300518 Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java?rev=1300539&r1=1300538&r2=1300539&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java (original) +++ cxf/branches/2.4.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java Wed Mar 14 13:34:25 2012 @@ -224,7 +224,7 @@ public class JettyHTTPDestination extend private void setHeadFalse(AbstractConnection con) { try { Generator gen = (Generator)con.getClass().getMethod("getGenerator").invoke(con); - gen.setHead(true); + gen.setHead(false); } catch (Exception ex) { //ignore - can continue }
