cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject git commit: [CXF-5590] Preventing ISE after socket timeouts, patch from Anthony Communier applied
Date Tue, 04 Mar 2014 21:40:09 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 10c6be015 -> 61dc5e108


[CXF-5590] Preventing ISE after socket timeouts, patch from Anthony Communier applied


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/61dc5e10
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/61dc5e10
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/61dc5e10

Branch: refs/heads/master
Commit: 61dc5e108a8ad5567ba222fd2061141a8d0f004b
Parents: 10c6be0
Author: Sergey Beryozkin <sberyozkin@talend.com>
Authored: Tue Mar 4 21:39:45 2014 +0000
Committer: Sergey Beryozkin <sberyozkin@talend.com>
Committed: Tue Mar 4 21:39:45 2014 +0000

----------------------------------------------------------------------
 .../src/main/java/org/apache/cxf/transport/http/HTTPConduit.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/61dc5e10/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 fb2175b..f5cd040 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
@@ -1311,7 +1311,8 @@ public abstract class HTTPConduit
                     buffer = null;
                     super.write(tmp.getRawBytes(), 0, tmp.size());
                 }
-                if (!written) {
+                boolean exceptionSet = outMessage.getContent(Exception.class) != null;
+                if (!written && !exceptionSet) {
                     handleHeadersTrustCaching();
                 }
                 if (!cachingForRetransmission) {


Mime
View raw message