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 2013/08/28 22:21:15 UTC
svn commit: r1518358 -
/cxf/branches/2.7.x-fixes/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
Author: dkulp
Date: Wed Aug 28 20:21:14 2013
New Revision: 1518358
URL: http://svn.apache.org/r1518358
Log:
Merged revisions 1518297 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1518297 | dkulp | 2013-08-28 13:45:06 -0400 (Wed, 28 Aug 2013) | 2 lines
Fix NPE on GET requests
........
Modified:
cxf/branches/2.7.x-fixes/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
Modified: cxf/branches/2.7.x-fixes/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java?rev=1518358&r1=1518357&r2=1518358&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java (original)
+++ cxf/branches/2.7.x-fixes/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java Wed Aug 28 20:21:14 2013
@@ -371,7 +371,7 @@ public class AsyncHTTPConduit extends UR
@Override
public void close() throws IOException {
- if (!chunking) {
+ if (!chunking && wrappedStream != null) {
CachedOutputStream out = (CachedOutputStream)wrappedStream;
this.basicEntity.setContentLength(out.size());
wrappedStream = null;