antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

Look up variables in per-thread scope first, then in shared global scope.

Browse source
This commit is contained in:
grob 2005-07-06 14:10:02 +00:00
parent 5ebbfe70a3
commit 38b4f265ce
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/helma/scripting/rhino/DynamicGlobalObject.java
View file

@ -35,14 +35,14 @@ public class DynamicGlobalObject extends GlobalObject {
} }
public Object get(String s, Scriptable scriptable) { public Object get(String s, Scriptable scriptable) {
Object obj = super.get(s, scriptable);
if (obj != null && obj != NOT_FOUND)
return obj;
Scriptable scope = getScope(); Scriptable scope = getScope();
if (scope != null) { if (scope != null) {
return scope.get(s, scope); Object obj = scope.get(s, scope);
if (obj != null && obj != NOT_FOUND) {
return obj;
}
} }
return NOT_FOUND; return super.get(s, scriptable);
} }
public void registerScope(Scriptable scope) { public void registerScope(Scriptable scope) {