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 8674417605 for ; Fri, 20 Mar 2015 22:33:08 +0000 (UTC) Received: (qmail 67076 invoked by uid 500); 20 Mar 2015 22:33:08 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 67013 invoked by uid 500); 20 Mar 2015 22:33:08 -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 67004 invoked by uid 99); 20 Mar 2015 22:33:08 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Mar 2015 22:33:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3F383E112F; Fri, 20 Mar 2015 22:33:08 +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: <2ca73a5de63c4227b7190febf2cbf2c2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: [CXF-6309] Unwrapping Fault if possible Date: Fri, 20 Mar 2015 22:33:08 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/2.7.x-fixes ab332bbb4 -> 6be44c2be [CXF-6309] Unwrapping Fault if possible Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6be44c2b Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6be44c2b Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6be44c2b Branch: refs/heads/2.7.x-fixes Commit: 6be44c2be060d6c8b7c31f9d7a773cfcd23ef0f0 Parents: ab332bb Author: Sergey Beryozkin Authored: Fri Mar 20 22:27:42 2015 +0000 Committer: Sergey Beryozkin Committed: Fri Mar 20 22:32:49 2015 +0000 ---------------------------------------------------------------------- .../src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/6be44c2b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java index 1cb6d53..84cc4e7 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java @@ -753,7 +753,8 @@ public abstract class AbstractClient implements Client, Retryable { cls, JAXRSUtils.mediaTypeToString(ct)); LOG.severe(errorMsg.toString()); - throw new ClientException(errorMsg.toString(), cause); + Throwable actualEx = ex instanceof Fault ? ((Fault)ex).getCause() : ex; + throw new ClientException(errorMsg.toString(), actualEx); } private static MediaType getResponseContentType(Response r) {