You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2017/02/27 10:43:12 UTC
cxf git commit: Adding a cached stream NPE check to HttpConduit
Repository: cxf
Updated Branches:
refs/heads/master ceb04f964 -> f1593e4d3
Adding a cached stream NPE check to HttpConduit
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f1593e4d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f1593e4d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f1593e4d
Branch: refs/heads/master
Commit: f1593e4d3ab856611f419f3948252ccfd4b09fa0
Parents: ceb04f9
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Mon Feb 27 10:42:58 2017 +0000
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Mon Feb 27 10:42:58 2017 +0000
----------------------------------------------------------------------
.../src/main/java/org/apache/cxf/transport/http/HTTPConduit.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/f1593e4d/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
index 10b53fc..8314c14 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
@@ -1259,7 +1259,7 @@ public abstract class HTTPConduit
// If this is a GET method we must not touch the output
// stream as this automagically turns the request into a POST.
- if (getMethod().equals("GET")) {
+ if (getMethod().equals("GET") || cachedStream == null) {
handleNoOutput();
return;
}