diff options
| author | Tom Tromey <tromey@redhat.com> | 2005-02-02 20:59:41 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2005-02-02 20:59:41 +0000 |
| commit | 6d27fe75d0c3200470aa42595746c853240ff6e0 (patch) | |
| tree | 549b32af6b15702bf023898cb2c6638202d540ed /libjava/java | |
| parent | 7ded35b4c2c8ebf53faa42987703616e2a813421 (diff) | |
| download | gcc-6d27fe75d0c3200470aa42595746c853240ff6e0.zip gcc-6d27fe75d0c3200470aa42595746c853240ff6e0.tar.gz gcc-6d27fe75d0c3200470aa42595746c853240ff6e0.tar.bz2 | |
re PR libgcj/19681 (extension loading currently incorrect)
PR libgcj/19681:
* Makefile.in: Rebuilt.
* Makefile.am (ordinary_java_source_files): Added new class.
* java/lang/natVMClassLoader.cc (getSystemClassLoaderInternal):
Use system_instance, not instance.
* gnu/gcj/runtime/SystemClassLoader.java: New file.
* gnu/gcj/runtime/VMClassLoader.java (init): Don't search
java.class.path.
(system_instance): New field.
(initialize): Initialize the system loader as well.
(VMClassLoader): Default to LIB_CACHE.
From-SVN: r94611
Diffstat (limited to 'libjava/java')
| -rw-r--r-- | libjava/java/lang/VMClassLoader.java | 4 | ||||
| -rw-r--r-- | libjava/java/lang/natVMClassLoader.cc | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libjava/java/lang/VMClassLoader.java b/libjava/java/lang/VMClassLoader.java index 1afda45..e21bb64 100644 --- a/libjava/java/lang/VMClassLoader.java +++ b/libjava/java/lang/VMClassLoader.java @@ -40,15 +40,19 @@ package java.lang; import gnu.java.util.EmptyEnumeration; import java.lang.reflect.Constructor; +import java.io.File; import java.io.IOException; import java.net.URL; +import java.net.URLClassLoader; import java.security.AllPermission; import java.security.Permission; import java.security.Permissions; import java.security.ProtectionDomain; +import java.util.ArrayList; import java.util.Enumeration; import java.util.HashMap; import java.util.Map; +import java.util.StringTokenizer; /** * java.lang.VMClassLoader is a package-private helper for VMs to implement diff --git a/libjava/java/lang/natVMClassLoader.cc b/libjava/java/lang/natVMClassLoader.cc index e34be99..cd98e7e 100644 --- a/libjava/java/lang/natVMClassLoader.cc +++ b/libjava/java/lang/natVMClassLoader.cc @@ -24,6 +24,7 @@ details. */ #include <java/lang/VMClassLoader.h> #include <java/lang/VMCompiler.h> #include <gnu/gcj/runtime/VMClassLoader.h> +#include <gnu/gcj/runtime/SystemClassLoader.h> #include <java/lang/ClassLoader.h> #include <java/lang/Class.h> #include <java/lang/Throwable.h> @@ -114,7 +115,7 @@ java::lang::ClassLoader * java::lang::VMClassLoader::getSystemClassLoaderInternal() { _Jv_InitClass (&gnu::gcj::runtime::VMClassLoader::class$); - return gnu::gcj::runtime::VMClassLoader::instance; + return gnu::gcj::runtime::VMClassLoader::system_instance; } jclass |