FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ClassLoader.java (system): Remove static field.

Browse source 
* java/lang/ClassLoader.java (system):  Remove static field.
	(getSystemClassLoader):  Get gnu.gcj.runtime.VMClassLoader.instance
	directly instead of using it to set the system field.
	(loadClass):  Use VMClassLoader.instance instead of system field.
	(findSystemClass):   Similar.
	* prims.cc (_Jv_RunMain):  Clear VMClassLoader::instance rather
	than ClassLoader::system which no longer exists.
	* java/lang/natClassLoader.java (_Jv_FindClass):  Simplify.

From-SVN: r45343
This commit is contained in:
Per Bothner 2001-08-31 18:17:24 -07:00 • committed by Per Bothner
parent 788d7b942c
commit 8635bb79f2
4 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
libjava/java/lang/ClassLoader.java
View file

@ -34,7 +34,6 @@ import java.util.Stack;
public abstract class ClassLoader
{
static private ClassLoader system;
private ClassLoader parent;
private HashMap definedPackages = new HashMap();
@ -46,9 +45,7 @@ public abstract class ClassLoader
public static ClassLoader getSystemClassLoader ()
{
if (system == null)
system = gnu.gcj.runtime.VMClassLoader.instance;
return system;
return gnu.gcj.runtime.VMClassLoader.instance;
}
/**
@ -120,7 +117,7 @@ public abstract class ClassLoader
if (parent != null)
return parent.loadClass (name, link);
else
c = system.findClass (name);
c = gnu.gcj.runtime.VMClassLoader.instance.findClass (name);
} catch (ClassNotFoundException ex) {
/* ignore, we'll try findClass */;
}
@ -464,7 +461,7 @@ public abstract class ClassLoader
protected final Class findSystemClass(String name)
throws java.lang.ClassNotFoundException
{
return getSystemClassLoader ().loadClass (name);
return gnu.gcj.runtime.VMClassLoader.instance.loadClass (name);
}
/*