archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8186815: Java.from has a bug, when element is ScriptObject

Browse source 
Reviewed-by: sundar, jlaskey
This commit is contained in:
Hannes Wallnöfer 2017-09-27 17:09:52 +02:00
parent 10f7bd1ab6
commit 2e46c1508a
2 changed files with 47 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJava.java
View file

@ -43,6 +43,7 @@ import jdk.dynalink.beans.StaticClass;
import jdk.dynalink.linker.support.TypeUtilities;
import jdk.nashorn.api.scripting.JSObject;
import jdk.nashorn.api.scripting.ScriptObjectMirror;
import jdk.nashorn.api.scripting.ScriptUtils;
import jdk.nashorn.internal.objects.annotations.Attribute;
import jdk.nashorn.internal.objects.annotations.Function;
import jdk.nashorn.internal.objects.annotations.ScriptClass;
@ -430,9 +431,9 @@ public final class NativeJava {
if (objArray == null) {
return null;
} else if (objArray instanceof Collection) {
return new NativeArray(((Collection<?>)objArray).toArray());
return new NativeArray(ScriptUtils.unwrapArray(((Collection<?>)objArray).toArray()));
} else if (objArray instanceof Object[]) {
return new NativeArray(((Object[])objArray).clone());
return new NativeArray(ScriptUtils.unwrapArray(((Object[])objArray).clone()));
} else if (objArray instanceof int[]) {
return new NativeArray(((int[])objArray).clone());
} else if (objArray instanceof double[]) {