Browse Source

Propagate EvaluationContext from LiteralExpression

Update getValue(EvaluationContext context, Object rootObject,
Class<T> desiredResultType) to propagate the EvaluationContext to
ExpressionUtils.

Issue: SPR-10953
(cherry picked from 686cd79)
pull/215/merge
Phillip Webb 12 years ago
parent
commit
5d8aa635c6
  1. 4
      spring-expression/src/main/java/org/springframework/expression/common/LiteralExpression.java
  2. BIN
      spring-messaging/activemq-data/localhost/KahaDB/db-1.log
  3. BIN
      spring-messaging/activemq-data/localhost/KahaDB/db.data
  4. BIN
      spring-messaging/activemq-data/localhost/KahaDB/db.redo

4
spring-expression/src/main/java/org/springframework/expression/common/LiteralExpression.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2013 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.
@ -102,7 +102,7 @@ public class LiteralExpression implements Expression { @@ -102,7 +102,7 @@ public class LiteralExpression implements Expression {
public <T> T getValue(EvaluationContext context, Object rootObject, Class<T> desiredResultType) throws EvaluationException {
Object value = getValue(context, rootObject);
return ExpressionUtils.convert(null, value, desiredResultType);
return ExpressionUtils.convert(context, value, desiredResultType);
}
public Class getValueType(Object rootObject) throws EvaluationException {

BIN
spring-messaging/activemq-data/localhost/KahaDB/db-1.log

Binary file not shown.

BIN
spring-messaging/activemq-data/localhost/KahaDB/db.data

Binary file not shown.

BIN
spring-messaging/activemq-data/localhost/KahaDB/db.redo

Binary file not shown.
Loading…
Cancel
Save