Changeset 14372

Timestamp:

02/13/13 19:28:12 (11 years ago)

Author:

Mark Evenson

Message:

Backport r14363 | mevenson | 2013-01-29 09:36:14 +0100 (Tue, 29 Jan 2013) | 5 lines

Add a constructor to allow MemoryClassLoader? to specify a parent.

Needed to allow the code in ​http://paste.lisp.org/display/134966 to work.

Patch by Milos Negovanovic.

Location:

branches/1.1.x/src/org/armedbear/lisp

Files:

• JavaClassLoader.java (modified) (1 diff)
• MemoryClassLoader.java (modified) (1 diff)
• runtime-class.lisp (modified) (1 diff)

branches/1.1.x/src/org/armedbear/lisp/JavaClassLoader.java

@@ -123 +123 @@
     public JavaClassLoader(ClassLoader parent) {
         super(new URL[] {}, parent);
+    }
+    
+    public JavaClassLoader(JavaClassLoader parent) {
+        super(new URL[] {}, (ClassLoader)parent);
     }
 

branches/1.1.x/src/org/armedbear/lisp/MemoryClassLoader.java

@@ -51 +51 @@
     public MemoryClassLoader(String internalNamePrefix) {
         this.internalNamePrefix = internalNamePrefix;
+    }
+
+    public MemoryClassLoader(JavaClassLoader parent) {
+        super(parent);
+        this.internalNamePrefix = "";
     }
 

branches/1.1.x/src/org/armedbear/lisp/runtime-class.lisp

@@ -36 +36 @@
    Field definitions are lists of the form (field-name type &key modifiers annotations)."
   (declare (ignorable superclass interfaces constructors methods fields access-flags annotations))
-  (let ((stream (sys::%make-byte-array-output-stream))
-         ;;TODO provide constructor in MemoryClassLoader
-        (memory-class-loader (java:jnew "org.armedbear.lisp.MemoryClassLoader" "")))
+  (let* ((stream (sys::%make-byte-array-output-stream))
+        (current-class-loader (java:get-current-classloader))
+        (memory-class-loader (java:jnew "org.armedbear.lisp.MemoryClassLoader" current-class-loader)))
     (multiple-value-bind (class-file method-implementation-fields)
         (apply #'java::%jnew-runtime-class class-name stream args)