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 9D7B111E7B for ; Fri, 11 Jul 2014 18:30:28 +0000 (UTC) Received: (qmail 56307 invoked by uid 500); 11 Jul 2014 18:30:28 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 56254 invoked by uid 500); 11 Jul 2014 18:30:28 -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 55922 invoked by uid 99); 11 Jul 2014 18:30:28 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Jul 2014 18:30:28 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id F35C883C897; Fri, 11 Jul 2014 18:30:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dkulp@apache.org To: commits@cxf.apache.org Date: Fri, 11 Jul 2014 18:30:28 -0000 Message-Id: <25bae370da5c43b087637354adfca3d9@git.apache.org> In-Reply-To: <93e1189959ca44688372e72689c8e5dd@git.apache.org> References: <93e1189959ca44688372e72689c8e5dd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/5] git commit: [CXF-5872] Fix NPE when Dispatch clients trying to process a fault [CXF-5872] Fix NPE when Dispatch clients trying to process a fault Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/388ee561 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/388ee561 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/388ee561 Branch: refs/heads/master Commit: 388ee56113467653f48f02d1d927b91a8ce9de45 Parents: 9be6ef6 Author: Daniel Kulp Authored: Fri Jul 11 12:43:21 2014 -0400 Committer: Daniel Kulp Committed: Fri Jul 11 14:29:30 2014 -0400 ---------------------------------------------------------------------- .../java/org/apache/cxf/interceptor/ClientFaultConverter.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/388ee561/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java b/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java index fcaab3d..9f2a178 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java +++ b/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java @@ -169,6 +169,9 @@ public class ClientFaultConverter extends AbstractInDatabindingInterceptor { try { Class exClass = faultWanted.getProperty(Class.class.getName(), Class.class); + if (exClass == null) { + return; + } if (e == null) { Constructor constructor = exClass.getConstructor(new Class[]{String.class}); e = constructor.newInstance(new Object[]{fault.getMessage()});