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

INT-28 Customized the EL parser with 'CreateObjectIfAttemptToReferenceNull' and 'GrowListsOnIndexBeyondSize' configuration, and fixed index incrementing.

Browse Source
This commit is contained in:
Mark Fisher
2009-08-25 21:28:40 +00:00
parent 42a1cf0e13
commit 0afaa22344
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
org.springframework.integration/src/main/java/org/springframework/integration/aop/MessagePublishingInterceptor.java
View File

@@ -28,7 +28,8 @@ import org.springframework.context.expression.MapAccessor;
import org.springframework.expression.EvaluationContext;
import org.springframework.expression.Expression;
import org.springframework.expression.ExpressionParser;
import org.springframework.expression.spel.SpelExpressionParserFactory;
import org.springframework.expression.spel.standard.SpelExpressionParser;
import org.springframework.expression.spel.standard.SpelExpressionParserConfiguration;
import org.springframework.expression.spel.support.StandardEvaluationContext;
import org.springframework.integration.channel.ChannelResolver;
import org.springframework.integration.channel.MessageChannelTemplate;
@@ -53,7 +54,9 @@ public class MessagePublishingInterceptor implements MethodInterceptor {
private final ExpressionSource expressionSource;
private final ExpressionParser parser = SpelExpressionParserFactory.getParser();
private final ExpressionParser parser = new SpelExpressionParser(
SpelExpressionParserConfiguration.CreateObjectIfAttemptToReferenceNull |
SpelExpressionParserConfiguration.GrowListsOnIndexBeyondSize);
private final InboundMessageMapper<Object> messageMapper = new SimpleMessageMapper();
@@ -75,7 +78,7 @@ public class MessagePublishingInterceptor implements MethodInterceptor {
}
public final Object invoke(final MethodInvocation invocation) throws Throwable {
StandardEvaluationContext context = new StandardEvaluationContext();
final StandardEvaluationContext context = new StandardEvaluationContext();
context.addPropertyAccessor(new MapAccessor());
Class<?> targetClass = AopUtils.getTargetClass(invocation.getThis());
Method method = AopUtils.getMostSpecificMethod(invocation.getMethod(), targetClass);
@@ -84,10 +87,10 @@ public class MessagePublishingInterceptor implements MethodInterceptor {
int index = 0;
Map<String, Object> argumentMap = new HashMap<String, Object>();
for (String argumentName : argumentNames) {
if (invocation.getArguments().length <= ++index) {
if (invocation.getArguments().length <= index) {
break;
}
argumentMap.put(argumentName, invocation.getArguments()[index]);
argumentMap.put(argumentName, invocation.getArguments()[index++]);
}
context.setVariable(this.expressionSource.getArgumentMapName(method), argumentMap);
}