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

Do not set values to JavaScript undefined. Rather, treat these as deletes.

Browse source
This commit is contained in:
hns 2003-12-03 15:19:17 +00:00
parent b622dbd039
commit c833015c1b
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,6 +20,7 @@ import org.mozilla.javascript.Context;
import org.mozilla.javascript.Scriptable; import org.mozilla.javascript.Scriptable;
import org.mozilla.javascript.ScriptableObject; import org.mozilla.javascript.ScriptableObject;
import org.mozilla.javascript.Wrapper; import org.mozilla.javascript.Wrapper;
import org.mozilla.javascript.Undefined;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -60,7 +61,9 @@ public class MapWrapper extends ScriptableObject {
map = new HashMap(); map = new HashMap();
} }
if (value instanceof Wrapper) { if (value == null || value == Undefined.instance) {
map.remove(name);
} else if (value instanceof Wrapper) {
map.put(name, ((Wrapper) value).unwrap()); map.put(name, ((Wrapper) value).unwrap());
} else { } else {
map.put(name, value); map.put(name, value);
@ -131,7 +134,10 @@ public class MapWrapper extends ScriptableObject {
if (map == null) { if (map == null) {
map = new HashMap(); map = new HashMap();
} }
if (value instanceof Wrapper) {
if (value == null || value == Undefined.instance) {
map.remove(Integer.toString(idx));
} else if (value instanceof Wrapper) {
map.put(Integer.toString(idx), ((Wrapper) value).unwrap()); map.put(Integer.toString(idx), ((Wrapper) value).unwrap());
} else { } else {
map.put(Integer.toString(idx), value); map.put(Integer.toString(idx), value);