jdk-sandbox: comparison jdk/src/share/classes/java/lang/ClassLoader.java

equal deleted inserted replaced

-:e14d48eee341
+:e2e5a973b879
 import java.util.Map;
 import java.util.Vector;
 import java.util.Hashtable;
 import java.util.WeakHashMap;
 import java.util.concurrent.ConcurrentHashMap;
+import sun.misc.BootClassLoaderHook;
 import sun.misc.ClassFileTransformer;
 import sun.misc.CompoundEnumeration;
 import sun.misc.Resource;
 import sun.misc.URLClassPath;
 import sun.misc.VM;
 import sun.reflect.Reflection;
 import sun.security.util.SecurityConstants;
-import sun.jkernel.DownloadManager;
 /**
 * A class loader is an object that is responsible for loading classes. The
 * class <tt>ClassLoader</tt> is an abstract class.  Given the <a
 * href="#name">binary name</a> of a class, a class loader should attempt to
 {
 synchronized (getClassLoadingLock(name)) {
 // First, check if the class has already been loaded
 Class c = findLoadedClass(name);
 if (c == null) {
+long t0 = System.nanoTime();
 try {
 if (parent != null) {
 c = parent.loadClass(name, false);
 } else {
-c = findBootstrapClass0(name);
+c = findBootstrapClassOrNull(name);
 }
 } catch (ClassNotFoundException e) {
+// ClassNotFoundException thrown if class not found
+// from the non-null parent class loader
+}
+if (c == null) {
 // If still not found, then invoke findClass in order
 // to find the class.
+long t1 = System.nanoTime();
 c = findClass(name);
+// this is the defining class loader; record the stats
+sun.misc.PerfCounter.getParentDelegationTime().addTime(t1 - t0);
+sun.misc.PerfCounter.getFindClassTime().addElapsedTimeFrom(t1);
+sun.misc.PerfCounter.getFindClasses().increment();
 }
 }
 if (resolve) {
 resolveClass(c);
 }
 {
 ClassLoader system = getSystemClassLoader();
 if (system == null) {
 if (!checkName(name))
 throw new ClassNotFoundException(name);
-return findBootstrapClass(name);
+Class cls = findBootstrapClass(name);
+if (cls == null) {
+throw new ClassNotFoundException(name);
+}
+return cls;
 }
 return system.loadClass(name);
 }
-private Class findBootstrapClass0(String name)
+/**
-throws ClassNotFoundException
+* Returns a class loaded by the bootstrap class loader;
+* or return null if not found.
+*/
+private Class findBootstrapClassOrNull(String name)
 {
-if (!checkName(name))
+if (!checkName(name)) return null;
-throw new ClassNotFoundException(name);
 return findBootstrapClass(name);
 }
-private native Class findBootstrapClass(String name)
+// return null if not found
-throws ClassNotFoundException;
+private native Class findBootstrapClass(String name);
 /**
 * Returns the class with the given <a href="#name">binary name</a> if this
 * loader has been recorded by the Java virtual machine as an initiating
 * loader of a class with that <a href="#name">binary name</a>.  Otherwise
 /**
 * Find resources from the VM's built-in classloader.
 */
 private static URL getBootstrapResource(String name) {
-try {
+BootClassLoaderHook.preLoadResource(name);
-// If this is a known JRE resource, ensure that its bundle is
-// downloaded.  If it isn't known, we just ignore the download
-// failure and check to see if we can find the resource anyway
-// (which is possible if the boot class path has been modified).
-if (sun.misc.VM.isBootedKernelVM()) {
-sun.jkernel.DownloadManager.getBootClassPathEntryForResource(
-name);
-}
-} catch (NoClassDefFoundError e) {
-// This happens while Java itself is being compiled; DownloadManager
-// isn't accessible when this code is first invoked.  It isn't an
-// issue, as if we can't find DownloadManager, we can safely assume
-// that additional code is not available for download.
-}
 URLClassPath ucp = getBootstrapClassPath();
 Resource res = ucp.getResource(name);
 return res != null ? res.getURL() : null;
 }
 }
 // Invoked in the java.lang.Runtime class to implement load and loadLibrary.
 static void loadLibrary(Class fromClass, String name,
 boolean isAbsolute) {
-try {
+BootClassLoaderHook.preLoadLibrary(name);
-if (VM.isBootedKernelVM() && !DownloadManager.isJREComplete() &&
-!DownloadManager.isCurrentThreadDownloading()) {
-DownloadManager.downloadFile("bin/" +
-System.mapLibraryName(name));
-// it doesn't matter if the downloadFile call returns false --
-// it probably just means that this is a user library, as
-// opposed to a JRE library
-}
-} catch (IOException e) {
-throw new UnsatisfiedLinkError("Error downloading library " +
-name + ": " + e);
-} catch (NoClassDefFoundError e) {
-// This happens while Java itself is being compiled; DownloadManager
-// isn't accessible when this code is first invoked.  It isn't an
-// issue, as if we can't find DownloadManager, we can safely assume
-// that additional code is not available for download.
-}
 ClassLoader loader =
 (fromClass == null) ? null : fromClass.getClassLoader();
 if (sys_paths == null) {
 usr_paths = initializePath("java.library.path");
 sys_paths = initializePath("sun.boot.library.path");
 new Object[] { parent });
 Thread.currentThread().setContextClassLoader(sys);
 return sys;
 }
 }

changeset 4209	e2e5a973b879
parent 4192	34d923c996e4
parent 3958	b8acd5ee4f4f
child 4352	ddaa5f39a2ac