Repository: deltaspike Updated Branches: refs/heads/master 299e8dc82 -> 9a74d8a28
DELTASPIKE-685 - Guard against null FacesContext in Exception Handler Bridge Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/9a74d8a2 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/9a74d8a2 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/9a74d8a2 Branch: refs/heads/master Commit: 9a74d8a2844a55eed7a2a0b49e1153d1bd5497a0 Parents: 299e8dc Author: Cody Lerum <[email protected]> Authored: Wed Aug 13 13:02:52 2014 -0600 Committer: Cody Lerum <[email protected]> Committed: Wed Aug 13 13:02:52 2014 -0600 ---------------------------------------------------------------------- .../jsf/impl/exception/control/BridgeExceptionHandlerWrapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/9a74d8a2/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/exception/control/BridgeExceptionHandlerWrapper.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/exception/control/BridgeExceptionHandlerWrapper.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/exception/control/BridgeExceptionHandlerWrapper.java index cf33bdd..8453007 100644 --- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/exception/control/BridgeExceptionHandlerWrapper.java +++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/exception/control/BridgeExceptionHandlerWrapper.java @@ -61,7 +61,7 @@ public class BridgeExceptionHandlerWrapper extends ExceptionHandlerWrapper imple { FacesContext context = FacesContext.getCurrentInstance(); - if (context.getResponseComplete()) + if (context == null || context.getResponseComplete()) { return; }
