[jbossws-commits] JBossWS SVN: r13696 - thirdparty/cxf/branches/cxf-2.2.12/rt/transports/http/src/main/java/org/apache/cxf/transport/http.
Author: alessio.soldano(a)jboss.com
Date: 2011-02-08 12:14:10 -0500 (Tue, 08 Feb 2011)
New Revision: 13696
Modified:
thirdparty/cxf/branches/cxf-2.2.12/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
Log:
[CXF-3065][JBPAPP-4564] Fixing HTTPConduit as per CXF 3065 changes applied on 2.3.x dev
line
Modified:
thirdparty/cxf/branches/cxf-2.2.12/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
===================================================================
---
thirdparty/cxf/branches/cxf-2.2.12/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java 2011-02-08
15:59:29 UTC (rev 13695)
+++
thirdparty/cxf/branches/cxf-2.2.12/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java 2011-02-08
17:14:10 UTC (rev 13696)
@@ -1804,7 +1804,9 @@
}
message.put(KEY_HTTP_CONNECTION, connection);
- connection.setFixedLengthStreamingMode(stream.size());
+ if (stream != null) {
+ connection.setFixedLengthStreamingMode(stream.size());
+ }
// Need to set the headers before the trust decision
// because they are set before the connect().
@@ -2203,9 +2205,11 @@
*/
protected void handleRetransmits() throws IOException {
// If we have a cachedStream, we are caching the request.
- if (cachedStream != null) {
+ if (cachedStream != null
+ || ("GET".equals(connection.getRequestMethod()) &&
getClient().isAutoRedirect())) {
- if (LOG.isLoggable(Level.FINE)) {
+
+ if (LOG.isLoggable(Level.FINE) && cachedStream != null) {
LOG.fine("Conduit \""
+ getConduitName()
+ "\" Transmit cached message to: "