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

RESOLVED - BATCH-616: Possible overflow in exit description if a stream.open() throws exception

Browse Source 
exit description is now truncated also on save
This commit is contained in:
robokaso
2008-05-12 08:48:07 +00:00
parent 2ac85e454b
commit 879b9fcb12
3 changed files with 60 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcStepExecutionDao.java
View File

@@ -178,6 +178,8 @@ public class JdbcStepExecutionDao extends AbstractJdbcBatchMetadataDao implement
"to-be-saved (not updated) StepExecution can't already have a version assigned");
validateStepExecution(stepExecution);
String exitDescription = truncateExitDescription(stepExecution.getExitStatus().getExitDescription());
stepExecution.setId(new Long(stepExecutionIncrementer.nextLongValue()));
stepExecution.incrementVersion(); // should be 0 now
@@ -185,7 +187,7 @@ public class JdbcStepExecutionDao extends AbstractJdbcBatchMetadataDao implement
stepExecution.getStepName(), stepExecution.getJobExecutionId(), stepExecution.getStartTime(),
stepExecution.getEndTime(), stepExecution.getStatus().toString(), stepExecution.getCommitCount(),
stepExecution.getItemCount(), stepExecution.getExitStatus().isContinuable() ? "Y" : "N",
stepExecution.getExitStatus().getExitCode(), stepExecution.getExitStatus().getExitDescription(),
stepExecution.getExitStatus().getExitCode(), exitDescription,
stepExecution.getReadSkipCount(), stepExecution.getWriteSkipCount(), stepExecution.getRollbackCount() };
getJdbcTemplate().update(
getQuery(SAVE_STEP_EXECUTION),
@@ -306,11 +308,7 @@ public class JdbcStepExecutionDao extends AbstractJdbcBatchMetadataDao implement
// Do not check for existence of step execution considering
// it is saved at every commit point.
String exitDescription = stepExecution.getExitStatus().getExitDescription();
if (exitDescription != null && exitDescription.length() > EXIT_MESSAGE_LENGTH) {
exitDescription = exitDescription.substring(0, EXIT_MESSAGE_LENGTH);
logger.debug("Truncating long message before update of StepExecution: " + stepExecution);
}
String exitDescription = truncateExitDescription(stepExecution.getExitStatus().getExitDescription());
// Attempt to prevent concurrent modification errors by blocking here if
// someone is already trying to do it.
@@ -321,9 +319,8 @@ public class JdbcStepExecutionDao extends AbstractJdbcBatchMetadataDao implement
stepExecution.getStatus().toString(), stepExecution.getCommitCount(), stepExecution.getItemCount(),
stepExecution.getExitStatus().isContinuable() ? "Y" : "N",
stepExecution.getExitStatus().getExitCode(), exitDescription, version,
stepExecution.getReadSkipCount(),
stepExecution.getWriteSkipCount(), stepExecution.getRollbackCount(),
stepExecution.getId(), stepExecution.getVersion() };
stepExecution.getReadSkipCount(), stepExecution.getWriteSkipCount(),
stepExecution.getRollbackCount(), stepExecution.getId(), stepExecution.getVersion() };
int count = getJdbcTemplate().update(
getQuery(UPDATE_STEP_EXECUTION),
parameters,
@@ -345,6 +342,22 @@ public class JdbcStepExecutionDao extends AbstractJdbcBatchMetadataDao implement
}
}
/**
* Truncate the exit description if the length exceeds
* {@link #EXIT_MESSAGE_LENGTH}.
* @param description the string to truncate
* @return truncated description
*/
private String truncateExitDescription(String description) {
if (description != null && description.length() > EXIT_MESSAGE_LENGTH) {
logger.debug("Truncating long message before update of StepExecution, original message is: " + description);
return description.substring(0, EXIT_MESSAGE_LENGTH);
}
else {
return description;
}
}
private class StepExecutionRowMapper implements RowMapper {
private final JobExecution jobExecution;