Changeset 13282

Timestamp:

05/21/11 12:40:49 (11 years ago)

Author:

Mark Evenson

Message:

Make JAVA:JRESOLVE-METHOD try harder to resolve a JAVA-OBJECT instance.

Unclear if this behavior comes from a bug in how we intialize
JAVA-OBJECT's intendedClass or is a "natural" result of some casting
assumption. We assume that users of JRESOLVE-METHOD would prefer some
sort of callable result as opposed to NIL as the current JAVA
introspection APIs assumption seems to geared to guessing a reasonable
default. Those wishing strict introspection semantics are advised to
use the java.lang.reflect package directly.

File:

• trunk/abcl/src/org/armedbear/lisp/Java.java (modified) (3 diffs)

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

@@ -772 +772 @@
 
     private static final Primitive JRESOLVE_METHOD = new pf_jresolve_method();
-    @DocString(name="jresolve_method", args="method-name instance &rest args",
+    @DocString(name="jresolve-method", args="method-name instance &rest args",
     doc="Finds the most specific Java method METHOD-NAME on INSTANCE " +
         "applicable to arguments ARGS. Returns NIL if no suitable method is " +
@@ -778 +778 @@
         "when it is called with a string as the first parameter (METHOD-REF).")
     private static final class pf_jresolve_method extends Primitive {
-
         pf_jresolve_method() {
             super(Symbol.JRESOLVE_METHOD);
@@ -807 +806 @@
             Object[] methodArgs = translateMethodArguments(args, 2);
             Method method = findMethod(instance, intendedClass, methodName, methodArgs);
+            if (method != null) {
+                return JavaObject.getInstance(method);
+            } else if (instanceArg instanceof JavaObject) {
+                // Sometimes JavaObject.intendedClass has the default
+                // value java.lang.Object, so we try again to resolve
+                // the method using a dynamically requested value for
+                // java.lang.Class.
+                intendedClass = ((JavaObject)instanceArg).getObject().getClass();
+                method = findMethod(instance, intendedClass, methodName, methodArgs);
+            } else {
+                return NIL;
+            }
             if (method != null) {
                 return JavaObject.getInstance(method);