Repository: deltaspike Updated Branches: refs/heads/master bfb01bd40 -> a56cbf844
DELTASPIKE-341 cache exception qualifier Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/a56cbf84 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/a56cbf84 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/a56cbf84 Branch: refs/heads/master Commit: a56cbf844c9b4ef3164c455b978675d2508f03bf Parents: bfb01bd Author: tandraschko <[email protected]> Authored: Sat Feb 15 20:39:09 2014 +0100 Committer: tandraschko <[email protected]> Committed: Sat Feb 15 20:39:09 2014 +0100 ---------------------------------------------------------------------- .../jsf/impl/exception/DeltaSpikeExceptionHandler.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/a56cbf84/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 2593d0e..f1b03f3 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 @@ -18,6 +18,7 @@ */ package org.apache.deltaspike.jsf.impl.exception; +import java.lang.annotation.Annotation; import java.util.Iterator; import javax.enterprise.inject.spi.BeanManager; import javax.faces.FacesException; @@ -36,7 +37,7 @@ import org.apache.deltaspike.jsf.api.config.JsfModuleConfig; public class DeltaSpikeExceptionHandler extends ExceptionHandlerWrapper implements Deactivatable { private final ExceptionHandler wrapped; - private final JsfModuleConfig jsfModuleConfig; + private final Annotation exceptionQualifier; private boolean isActivated = true; @@ -44,7 +45,8 @@ public class DeltaSpikeExceptionHandler extends ExceptionHandlerWrapper implemen { this.isActivated = ClassDeactivationUtils.isActivated(getClass()); this.wrapped = wrapped; - this.jsfModuleConfig = BeanProvider.getContextualReference(JsfModuleConfig.class); + this.exceptionQualifier = AnnotationInstanceProvider.of( + BeanProvider.getContextualReference(JsfModuleConfig.class).getExceptionQualifier()); } @Override @@ -77,9 +79,7 @@ public class DeltaSpikeExceptionHandler extends ExceptionHandlerWrapper implemen Throwable throwable = iterator.next().getContext().getException(); Throwable rootCause = getRootCause(throwable); - ExceptionToCatchEvent event = new ExceptionToCatchEvent( - rootCause, - AnnotationInstanceProvider.of(jsfModuleConfig.getExceptionQualifier())); + ExceptionToCatchEvent event = new ExceptionToCatchEvent(rootCause, exceptionQualifier); beanManager.fireEvent(event);
