infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-06-06 02:33:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

8165563: ClassLoader::getSystemClassLoader will never be null

Browse Source 
Reviewed-by: alanb, dholmes, psandoz
This commit is contained in:
Mandy Chung 2016-09-08 09:45:50 -07:00
parent 6784a0986e
commit 37ff205c8a
1 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
jdk/src/java.base/share/classes/java/lang/ClassLoader.java
View File

@ -1167,17 +1167,7 @@ public abstract class ClassLoader {
protected final Class<?> findSystemClass(String name)
throws ClassNotFoundException
{
ClassLoader system = getSystemClassLoader();
if (system == null) {
if (!checkName(name))
throw new ClassNotFoundException(name);
Class<?> cls = findBootstrapClass(name);
if (cls == null) {
throw new ClassNotFoundException(name);
}
return cls;
}
return system.loadClass(name);
return getSystemClassLoader().loadClass(name);
}
/**
@ -1437,11 +1427,7 @@ public abstract class ClassLoader {
* @since 1.1
*/
public static URL getSystemResource(String name) {
ClassLoader system = getSystemClassLoader();
if (system == null) {
return BootLoader.findResource(name);
}
return system.getResource(name);
return getSystemClassLoader().getResource(name);
}
/**
@ -1464,17 +1450,13 @@ public abstract class ClassLoader {
*
* @throws IOException
* If I/O errors occur
*
* @since 1.2
*/
public static Enumeration<URL> getSystemResources(String name)
throws IOException
{
ClassLoader system = getSystemClassLoader();
if (system == null) {
return BootLoader.findResources(name);
}
return system.getResources(name);
return getSystemClassLoader().getResources(name);
}
/**
@ -1631,8 +1613,7 @@ public abstract class ClassLoader {
* this method during startup should take care not to cache the return
* value until the system is fully initialized.
*
* @return The system <tt>ClassLoader</tt> for delegation, or
* <tt>null</tt> if none
* @return The system <tt>ClassLoader</tt> for delegation
*
* @throws SecurityException
* If a security manager is present, and the caller's class loader