Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7A8FB10819 for ; Tue, 4 Mar 2014 21:40:12 +0000 (UTC) Received: (qmail 58596 invoked by uid 500); 4 Mar 2014 21:40:11 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 58479 invoked by uid 500); 4 Mar 2014 21:40:10 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 58472 invoked by uid 99); 4 Mar 2014 21:40:10 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Mar 2014 21:40:10 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B04B6935FFE; Tue, 4 Mar 2014 21:40:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergeyb@apache.org To: commits@cxf.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: [CXF-5590] Preventing ISE after socket timeouts, patch from Anthony Communier applied Date: Tue, 4 Mar 2014 21:40:09 +0000 (UTC) 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 Authored: Tue Mar 4 21:39:45 2014 +0000 Committer: Sergey Beryozkin 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) {