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

Removed throwable from StepExecution (it's not persisted anyway, but the ExitStatus is)

Browse Source
This commit is contained in:
dsyer
2007-10-01 06:35:49 +00:00
parent 7feb3bbc33
commit 5da09d8c48
3 changed files with 39 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
execution/src/main/java/org/springframework/batch/execution/step/simple/SimpleExitCodeExceptionClassifier.java
View File

@@ -20,47 +20,61 @@ import org.springframework.batch.core.executor.StepInterruptedException;
import org.springframework.batch.repeat.ExitStatus;
/**
* <p>Simple implementation of {@link ExitCodeExceptionClassifier} that returns basic
* String exit codes, and defaults to the class name of the throwable
* for the message. Most users will want to write their own implementation
* that creates more specific exit codes for different exception types.</p>
* <p>
* Simple implementation of {@link ExitCodeExceptionClassifier} that returns
* basic String exit codes, and defaults to the class name of the throwable for
* the message. Most users will want to write their own implementation that
* creates more specific exit codes for different exception types.
* </p>
*
* @author Lucas Ward
*
*
*/
public class SimpleExitCodeExceptionClassifier implements
ExitCodeExceptionClassifier {
/* (non-Javadoc)
/*
* (non-Javadoc)
*
* @see org.springframework.batch.core.executor.ExitCodeExceptionClassifier#classifyForExitCode(java.lang.Throwable)
*/
public ExitStatus classifyForExitCode(Throwable throwable) {
return (ExitStatus)classify(throwable);
return (ExitStatus) classify(throwable);
}
/* (non-Javadoc)
/*
* (non-Javadoc)
*
* @see org.springframework.batch.common.ExceptionClassifier#classify(java.lang.Throwable)
*/
public Object classify(Throwable throwable) {
ExitStatus exitStatus = ExitStatus.FAILED;
if(throwable instanceof StepInterruptedException){
exitStatus = new ExitStatus(false, STEP_INTERRUPTED, StepInterruptedException.class.getName());
if (throwable instanceof StepInterruptedException) {
exitStatus = new ExitStatus(false, STEP_INTERRUPTED,
StepInterruptedException.class.getName());
} else {
String message = "";
if (throwable!=null) {
message = throwable.getClass().getName();
if (throwable.getMessage()!=null) {
message += ": " + throwable.getMessage();
}
}
exitStatus = new ExitStatus(false, FATAL_EXCEPTION, message);
}
else{
exitStatus = new ExitStatus(false,
FATAL_EXCEPTION, throwable == null ? "" : throwable.getClass().getName());
}
return exitStatus;
}
/* (non-Javadoc)
/*
* (non-Javadoc)
*
* @see org.springframework.batch.common.ExceptionClassifier#getDefault()
*/
public Object getDefault() {
//return without message since we don't know what the exception is
// return without message since we don't know what the exception is
return new ExitStatus(false, FATAL_EXCEPTION);
}

1
execution/src/main/java/org/springframework/batch/execution/step/simple/SimpleStepExecutor.java
View File

@@ -254,7 +254,6 @@ public class SimpleStepExecutor implements StepExecutor {
//classify exception so an exit code can be stored.
status = exceptionClassifier.classifyForExitCode(e);
stepExecution.setException(e);
if (e.getCause() instanceof StepInterruptedException) {
updateStatus(stepExecution, BatchStatus.STOPPED);
throw (StepInterruptedException) e.getCause();