Return-Path: X-Original-To: apmail-deltaspike-commits-archive@www.apache.org Delivered-To: apmail-deltaspike-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 4B55110AC6 for ; Sun, 23 Mar 2014 22:24:36 +0000 (UTC) Received: (qmail 11645 invoked by uid 500); 23 Mar 2014 22:24:35 -0000 Delivered-To: apmail-deltaspike-commits-archive@deltaspike.apache.org Received: (qmail 11602 invoked by uid 500); 23 Mar 2014 22:24:35 -0000 Mailing-List: contact commits-help@deltaspike.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@deltaspike.apache.org Delivered-To: mailing list commits@deltaspike.apache.org Received: (qmail 11595 invoked by uid 99); 23 Mar 2014 22:24:35 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 23 Mar 2014 22:24:35 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1C686988472; Sun, 23 Mar 2014 22:24:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tandraschko@apache.org To: commits@deltaspike.apache.org Message-Id: <37df9b0d09ec426186d3210ba89cee86@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: DELTASPIKE-545 implemented #getRootCause to avoid NPE's Date: Sun, 23 Mar 2014 22:24:35 +0000 (UTC) Repository: deltaspike Updated Branches: refs/heads/master 61c68f012 -> 72bf21777 DELTASPIKE-545 implemented #getRootCause to avoid NPE's Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/72bf2177 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/72bf2177 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/72bf2177 Branch: refs/heads/master Commit: 72bf21777346b64a93afa33b43cec5b6b8b12fee Parents: 61c68f0 Author: tandraschko Authored: Sun Mar 23 23:24:24 2014 +0100 Committer: tandraschko Committed: Sun Mar 23 23:24:24 2014 +0100 ---------------------------------------------------------------------- .../jsf/impl/exception/DeltaSpikeExceptionHandler.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/72bf2177/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/exception/DeltaSpikeExceptionHandler.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/exception/DeltaSpikeExceptionHandler.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/exception/DeltaSpikeExceptionHandler.java index e2b8f47..360655a 100644 --- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/exception/DeltaSpikeExceptionHandler.java +++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/exception/DeltaSpikeExceptionHandler.java @@ -20,6 +20,7 @@ package org.apache.deltaspike.jsf.impl.exception; import java.lang.annotation.Annotation; import java.util.Iterator; +import javax.el.ELException; import javax.enterprise.inject.spi.BeanManager; import javax.faces.FacesException; import javax.faces.context.ExceptionHandler; @@ -102,6 +103,18 @@ public class DeltaSpikeExceptionHandler extends ExceptionHandlerWrapper implemen super.handle(); } + @Override + public Throwable getRootCause(Throwable throwable) + { + while ((ELException.class.isInstance(throwable) || FacesException.class.isInstance(throwable)) + && throwable.getCause() != null) + { + throwable = throwable.getCause(); + } + + return throwable; + } + private void lazyInit() { if (this.initialized == null)