Browse Source

jfinal 4.4

James 6 years ago
parent
commit
713751adf7
1 changed files with 6 additions and 2 deletions
  1. 6 2
      src/main/java/com/jfinal/template/stat/Scope.java

+ 6 - 2
src/main/java/com/jfinal/template/stat/Scope.java

@@ -89,7 +89,8 @@ public class Scope {
 	 * 自内向外在作用域栈中查找变量,返回最先找到的变量
 	 * 自内向外在作用域栈中查找变量,返回最先找到的变量
 	 */
 	 */
 	public Object get(Object key) {
 	public Object get(Object key) {
-		for (Scope cur=this; cur!=null; cur=cur.parent) {
+		Scope cur = this;
+		do {
 //			if (cur.data != null && cur.data.containsKey(key)) {
 //			if (cur.data != null && cur.data.containsKey(key)) {
 //				return cur.data.get(key);
 //				return cur.data.get(key);
 //			}
 //			}
@@ -104,7 +105,10 @@ public class Scope {
 					return null;
 					return null;
 				}
 				}
 			}
 			}
-		}
+			
+			cur = cur.parent;
+		} while (cur != null);
+		
 		// return null;
 		// return null;
 		return sharedObjectMap != null ? sharedObjectMap.get(key) : null;
 		return sharedObjectMap != null ? sharedObjectMap.get(key) : null;
 	}
 	}