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

a bad expression will throw an exception directly, but a missing header will still fall through to the next strategy

Browse Source
This commit is contained in:
Mark Fisher
2010-11-18 00:39:32 -05:00
parent 22bb005081
commit e69342510f
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-integration-file/src/main/java/org/springframework/integration/file/DefaultFileNameGenerator.java
View File

@@ -18,7 +18,6 @@ package org.springframework.integration.file;
import java.io.File;
import org.springframework.expression.EvaluationException;
import org.springframework.integration.Message;
import org.springframework.integration.util.AbstractExpressionEvaluator;
import org.springframework.util.Assert;
@@ -62,13 +61,7 @@ public class DefaultFileNameGenerator extends AbstractExpressionEvaluator implem
}
public String generateFileName(Message<?> message) {
Object filenameProperty = null;
try {
filenameProperty = this.evaluateExpression(this.expression, message);
}
catch (EvaluationException e) {
// will fall through to the payload or id.msg format
}
Object filenameProperty = this.evaluateExpression(this.expression, message);
if (filenameProperty instanceof String && StringUtils.hasText((String) filenameProperty)) {
return (String) filenameProperty;
}