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

Align SpringELExpressionParser with Framework's nullable changes

Browse Source 
TemplateAwareExpressionParser.parseExpression(String, ParserContext)
no longer accepts a null ParserContext so we now have to call
TemplateAwareExpressionParser.parseExpression(String) when we don't
have a ParserContext.
This commit is contained in:
Andy Wilkinson
2017-06-19 14:35:34 +01:00
parent 1f0f1f600b
commit ee6c0b0e13
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-binding/src/main/java/org/springframework/binding/expression/spel/SpringELExpressionParser.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2004-2014 the original author or authors.
* Copyright 2004-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -93,7 +93,11 @@ public class SpringELExpressionParser implements ExpressionParser {
}
private org.springframework.expression.Expression parseSpelExpression(String expression, ParserContext context) {
return expressionParser.parseExpression(expression, getSpelParserContext(context));
org.springframework.expression.ParserContext spelParserContext = getSpelParserContext(context);
if (spelParserContext != null) {
return expressionParser.parseExpression(expression, spelParserContext);
}
return expressionParser.parseExpression(expression);
}
private org.springframework.expression.ParserContext getSpelParserContext(ParserContext context) {