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

Do not wrap primitive property values as objects when retrieving them - as objects

Browse source 
they are unusable for many purpuses, e.g. testing for equality via ==.
This commit is contained in:
hns 2003-11-06 12:00:28 +00:00
parent 16621735c6
commit 646ef8f495
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -59,6 +59,7 @@ public class MapWrapper extends ScriptableObject {
if (map == null) { if (map == null) {
map = new HashMap(); map = new HashMap();
} }
if (value instanceof Wrapper) { if (value instanceof Wrapper) {
map.put(name, ((Wrapper) value).unwrap()); map.put(name, ((Wrapper) value).unwrap());
} else { } else {
@ -82,7 +83,11 @@ public class MapWrapper extends ScriptableObject {
Object obj = map.get(name); Object obj = map.get(name);
if (obj != null && !(obj instanceof Scriptable)) { if (obj != null && !(obj instanceof Scriptable)) {
if (obj instanceof String) { // do NOT wrap primitives - otherwise they'll be wrapped as Objects,
// which makes them unusable for many purposes (e.g. ==)
if (obj instanceof String ||
obj instanceof Number ||
obj instanceof Boolean) {
return obj; return obj;
} }
@ -149,6 +154,14 @@ public class MapWrapper extends ScriptableObject {
Object obj = map.get(Integer.toString(idx)); Object obj = map.get(Integer.toString(idx));
if (obj != null && !(obj instanceof Scriptable)) { if (obj != null && !(obj instanceof Scriptable)) {
// do NOT wrap primitives - otherwise they'll be wrapped as Objects,
// which makes them unusable for many purposes (e.g. ==)
if (obj instanceof String ||
obj instanceof Number ||
obj instanceof Boolean) {
return obj;
}
return Context.toObject(obj, core.global); return Context.toObject(obj, core.global);
} }