Changeset 13328

Timestamp:

06/14/11 10:05:04 (12 years ago)

Author:

Mark Evenson

Message:

Fix JNEW-ARRAY-FROM-ARRAY to create byte[] arrays.

File:

• trunk/abcl/src/org/armedbear/lisp/Java.java (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/Java.java

@@ -710 +710 @@
                 for (int i = 2; i<args.length - 1; i++)
                     a = Array.get(a, ((Integer)args[i].javaInstance()).intValue());
-                Array.set(a, ((Integer)args[args.length - 1].javaInstance()).intValue(), v.javaInstance());
+                Object value = v.javaInstance();
+                int index = ((Integer)args[args.length - 1].javaInstance()).intValue();
+                if (value instanceof java.lang.Number
+                    && a.getClass().getComponentType().equals(Byte.TYPE)) {
+                    Array.setByte(a, index, ((java.lang.Number)value).byteValue());
+                } else {
+                    Array.set(a, index, value);
+                }
                 return v;
             }