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

Internal adaptation to Deque semantics

Browse Source
This commit is contained in:
Juergen Hoeller
2018-02-12 15:55:09 +01:00
parent e7076ad35c
commit d5cabca2f7
4 changed files with 70 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-expression/src/main/java/org/springframework/expression/spel/ExpressionState.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2017 the original author or authors.
* Copyright 2002-2018 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.
@@ -23,6 +23,7 @@ import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.expression.EvaluationContext;
@@ -49,6 +50,7 @@ import org.springframework.util.CollectionUtils;
* nodes might need.
*
* @author Andy Clement
* @author Juergen Hoeller
* @since 3.0
*/
public class ExpressionState {
@@ -118,7 +120,12 @@ public class ExpressionState {
if (this.contextObjects == null) {
this.contextObjects = new ArrayDeque<>();
}
this.contextObjects.pop();
try {
this.contextObjects.pop();
}
catch (NoSuchElementException ex) {
throw new IllegalStateException("Cannot pop active context object: stack is empty");
}
}
public TypedValue getRootContextObject() {
@@ -197,9 +204,7 @@ public class ExpressionState {
@Nullable
public Object lookupLocalVariable(String name) {
int scopeNumber = initVariableScopes().size() - 1;
for (int i = scopeNumber; i >= 0; i--) {
VariableScope scope = initVariableScopes().get(i);
for (VariableScope scope : initVariableScopes()) {
if (scope.definesVariable(name)) {
return scope.lookupVariable(name);
}