Changeset 14688

Timestamp:

04/18/14 06:15:47 (9 years ago)

Author:

Mark Evenson

Message:

Backport r14687: Fix loading of JNA with recent JCALL improvements.

From Olof.

Location:

branches/1.3.1

Files:

• src/org/armedbear/lisp/Java.java (modified) (1 diff)
• test/lisp/abcl/java-tests.lisp (modified) (1 diff)

branches/1.3.1/src/org/armedbear/lisp/Java.java

@@ -1066 +1066 @@
             Class<?> methodType = methodTypes[i];
             Object arg = args[i];
-            if (!isAssignable(arg.getClass(), methodType)) {
+            if (arg == null) {
+                return !methodType.isPrimitive();
+            } else if (!isAssignable(arg.getClass(), methodType)) {
                 return false;
             }

branches/1.3.1/test/lisp/abcl/java-tests.lisp

@@ -204 +204 @@
   0)
 
+(deftest jcall.7
+  (signals-error (jcall "offsetByCodePoints" "foobar" 0 nil)
+                 #+abcl    'java-exception
+                 #+allegro 'jlinker-error))
+
 (deftest jfield.1
   (type-of (jfield "java.lang.Integer" "TYPE"))