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:43:09 GMT
Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes d635b081f -> 86e075bf6


[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/86e075bf
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/86e075bf
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/86e075bf

Branch: refs/heads/2.7.x-fixes
Commit: 86e075bf67b4978839d3e9a3501aed7e4e0af372
Parents: d635b08
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:42:41 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/86e075bf/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 a62e693..cbe6566 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
@@ -1298,7 +1298,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