From ee6c0b0e13c031b2fecba60ef8494aea6d43fe21 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 19 Jun 2017 14:35:34 +0100 Subject: [PATCH] Align SpringELExpressionParser with Framework's nullable changes 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. --- .../binding/expression/spel/SpringELExpressionParser.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/spel/SpringELExpressionParser.java b/spring-binding/src/main/java/org/springframework/binding/expression/spel/SpringELExpressionParser.java index 40c6d231..89d47211 100644 --- a/spring-binding/src/main/java/org/springframework/binding/expression/spel/SpringELExpressionParser.java +++ b/spring-binding/src/main/java/org/springframework/binding/expression/spel/SpringELExpressionParser.java @@ -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) {