Spring/spring-webflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SWF-1381 Back out check for endless recursive exception handling

Browse Source
This commit is contained in:
Rossen Stoyanchev
2010-09-02 09:13:22 +00:00
parent a2c83a1fe6
commit 0d6f441682
2 changed files with 2 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
spring-webflow/src/main/java/org/springframework/webflow/engine/impl/FlowExecutionImpl.java
View File

@@ -581,28 +581,8 @@ public class FlowExecutionImpl implements FlowExecution, Externalizable {
* @param context the request control context the exception occurred in
* @throws FlowExecutionException re-throws the exception if it was not handled at the state or flow level
*/
private void handleException(FlowExecutionException exception, RequestControlContext context)
throws FlowExecutionException {
handleException(exception, context, 1);
}
/**
* This is an overloaded method for {@link #handleException(FlowExecutionException, RequestControlContext)} adding a
* handleExceptionCount argument that can be used to prevent infinite recursion.
*
* @param exception the exception that occurred
* @param context the request control context the exception occurred in
* @param handleExceptionCount the number of recursive attempts made at exception handling
*/
private void handleException(FlowExecutionException exception, RequestControlContext context,
int handleExceptionCount) {
private void handleException(FlowExecutionException exception, RequestControlContext context) {
listeners.fireExceptionThrown(context, exception);
if (handleExceptionCount > 5) {
if (logger.isDebugEnabled()) {
logger.debug("Exception not handled after 5 tries, aborting exception handling of [" + exception + "]");
}
throw exception;
}
if (logger.isDebugEnabled()) {
if (exception.getCause() != null) {
logger.debug("Attempting to handle [" + exception + "] with root cause [" + getRootCause(exception)
@@ -621,7 +601,7 @@ public class FlowExecutionImpl implements FlowExecution, Externalizable {
}
} catch (FlowExecutionException newException) {
// exception handling itself resulted in a new FlowExecutionException, try to handle it
handleException(newException, context, handleExceptionCount + 1);
handleException(newException, context);
handled = true;
}
if (!handled) {

19
spring-webflow/src/test/java/org/springframework/webflow/engine/impl/FlowExecutionImplTests.java
View File

@@ -270,25 +270,6 @@ public class FlowExecutionImplTests extends TestCase {
assertEquals(2, exceptionHandler.getHandleCount());
}
public void testExceptionHandledAvoidEndlessRecursion() {
Flow flow = new Flow("flow");
ExceptionThrowingExceptionHandler exceptionHandler = new ExceptionThrowingExceptionHandler(false);
flow.getExceptionHandlerSet().add(exceptionHandler);
new State(flow, "state") {
protected void doEnter(RequestControlContext context) throws FlowExecutionException {
throw new FlowExecutionException("flow", "state", "Oops");
}
};
FlowExecutionImpl execution = new FlowExecutionImpl(flow);
MockExternalContext context = new MockExternalContext();
try {
execution.start(null, context);
fail("Should have aborted exception handling after 5 tries");
} catch (FlowExecutionException e) {
assertEquals(5, exceptionHandler.handleCount);
}
}
public void testStartCannotCallTwice() {
Flow flow = new Flow("flow");
new EndState(flow, "end");