Allows null values in maps

mozilla · May 10, 2021 · 0849085 · 0849085
1 parent cf84dbf
commit 0849085
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/org/mozilla/javascript/NativeJavaMap.java b/src/org/mozilla/javascript/NativeJavaMap.java
@@ -66,7 +66,7 @@ public Object get(String name, Scriptable start) {
         if (cx != null && cx.hasFeature(Context.FEATURE_ENABLE_JAVA_MAP_ACCESS)) {
             if (map.containsKey(name)) {
                 Object obj = map.get(name);
-                return cx.getWrapFactory().wrap(cx, this, obj, obj.getClass());
+                return cx.getWrapFactory().wrap(cx, this, obj, obj == null ? null : obj.getClass());
             }
         }
         return super.get(name, start);
@@ -78,7 +78,7 @@ public Object get(int index, Scriptable start) {
         if (cx != null && cx.hasFeature(Context.FEATURE_ENABLE_JAVA_MAP_ACCESS)) {
             if (map.containsKey(Integer.valueOf(index))) {
                 Object obj = map.get(Integer.valueOf(index));
-                return cx.getWrapFactory().wrap(cx, this, obj, obj.getClass());
+                return cx.getWrapFactory().wrap(cx, this, obj, obj == null ? null : obj.getClass());
             }
         }
         return super.get(index, start);

diff --git a/testsrc/org/mozilla/javascript/tests/NativeJavaMapTest.java b/testsrc/org/mozilla/javascript/tests/NativeJavaMapTest.java
@@ -41,6 +41,15 @@ public NativeJavaMapTest() {
         global.init(ContextFactory.getGlobal());
     }
 
+    public void testAccessingNullValues() {
+        Map<Object, Number> map = new HashMap<>();
+        map.put("a", null);
+        map.put(1, null);
+        assertEquals(2, runScriptAsInt("value.size()", map, true));
+        assertEquals(null, runScript("value.a", map, true));
+        assertEquals(null, runScript("value[1]", map, true));
+    }
+
     public void testAccessingJavaMapIntegerValues() {
         Map<Number, Number> map = new HashMap<>();
         map.put(0, 1);