Repository: deltaspike Updated Branches: refs/heads/master 21cf0a6b6 -> 91d09ca1d
Looks like I missed one case. The tests now pass as expected. Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/91d09ca1 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/91d09ca1 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/91d09ca1 Branch: refs/heads/master Commit: 91d09ca1d0978781d39620929a1ae64687b6388b Parents: 9e66540 Author: Jason Porter <[email protected]> Authored: Mon Jun 16 14:27:31 2014 -0600 Committer: Jason Porter <[email protected]> Committed: Tue Jun 17 12:49:37 2014 -0600 ---------------------------------------------------------------------- .../exception/control/ExceptionHandlerBroadcaster.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/91d09ca1/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/ExceptionHandlerBroadcaster.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/ExceptionHandlerBroadcaster.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/ExceptionHandlerBroadcaster.java index ab07d5a..e560a82 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/ExceptionHandlerBroadcaster.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/ExceptionHandlerBroadcaster.java @@ -50,14 +50,14 @@ public class ExceptionHandlerBroadcaster * Observes the event, finds the correct exception handler(s) and invokes them. * * @param exceptionEventEvent exception to be invoked - * @param beanManager active bean manager + * @param beanManager active bean manager * @throws Throwable If a handler requests the exception to be re-thrown. */ public void executeHandlers(@Observes @Any ExceptionToCatchEvent exceptionEventEvent, final BeanManager beanManager) throws Throwable { LOG.entering( - ExceptionHandlerBroadcaster.class.getName(), "executeHandlers", exceptionEventEvent.getException()); + ExceptionHandlerBroadcaster.class.getName(), "executeHandlers", exceptionEventEvent.getException()); CreationalContext<Object> creationalContext = null; @@ -76,7 +76,7 @@ public class ExceptionHandlerBroadcaster beanManager.fireEvent(stack); // Allow for modifying the exception stack - inbound_cause: + inbound_cause: //indentation needed by the current checkstyle rules while (stack.getCurrent() != null) { @@ -119,11 +119,9 @@ public class ExceptionHandlerBroadcaster stack.skipCause(); continue inbound_cause; case THROW_ORIGINAL: - throwException = exceptionEventEvent.getException(); - break; + throw exceptionEventEvent.getException(); case THROW: - throwException = callbackEvent.getThrowNewException(); - break; + throw callbackEvent.getThrowNewException(); default: throw new IllegalStateException( "Unexpected enum type " + callbackEvent.getCurrentExceptionHandlingFlow());
