root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

fixed setRootObject check in StandardEvaluationContext (SPR-8241)

This commit is contained in:
Juergen Hoeller 2011-11-28 17:34:47 +00:00
parent 1843bdde35
commit 81e9f6cc2c
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
org.springframework.expression/src/main/java/org/springframework/expression/spel/support/StandardEvaluationContext.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2009 the original author or authors. * Copyright 2002-2011 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -80,18 +80,14 @@ public class StandardEvaluationContext implements EvaluationContext {
} }
public void setRootObject(Object rootObject) {
if (this.rootObject == null) {
this.rootObject = TypedValue.NULL;
} else {
this.rootObject = new TypedValue(rootObject);//, TypeDescriptor.forObject(rootObject));
}
}
public void setRootObject(Object rootObject, TypeDescriptor typeDescriptor) { public void setRootObject(Object rootObject, TypeDescriptor typeDescriptor) {
this.rootObject = new TypedValue(rootObject, typeDescriptor); this.rootObject = new TypedValue(rootObject, typeDescriptor);
} }
public void setRootObject(Object rootObject) {
this.rootObject = (rootObject != null ? new TypedValue(rootObject) : TypedValue.NULL);
}
public TypedValue getRootObject() { public TypedValue getRootObject() {
return this.rootObject; return this.rootObject;
} }