1.1 --- a/src/jdk/nashorn/internal/runtime/ScriptLoader.java Sat Feb 09 16:58:48 2013 +0100 1.2 +++ b/src/jdk/nashorn/internal/runtime/ScriptLoader.java Mon Feb 11 21:26:06 2013 +0530 1.3 @@ -28,34 +28,17 @@ 1.4 import java.security.CodeSource; 1.5 1.6 /** 1.7 - * Responsible for loading generated and disk based classes. 1.8 + * Responsible for loading script generated classes. 1.9 * 1.10 */ 1.11 final class ScriptLoader extends NashornLoader { 1.12 /** 1.13 * Constructor. 1.14 */ 1.15 - ScriptLoader(final ClassLoader parent, final Context context) { 1.16 + ScriptLoader(final StructureLoader parent, final Context context) { 1.17 super(parent, context); 1.18 } 1.19 1.20 - @Override 1.21 - protected synchronized Class<?> loadClass(final String name, final boolean resolve) throws ClassNotFoundException { 1.22 - checkPackageAccess(name); 1.23 - 1.24 - // check the cache first 1.25 - Class<?> cl = findLoadedClass(name); 1.26 - if (cl == null) { 1.27 - cl = getParent().loadClass(name); 1.28 - } 1.29 - 1.30 - if (resolve) { 1.31 - resolveClass(cl); 1.32 - } 1.33 - 1.34 - return cl; 1.35 - } 1.36 - 1.37 // package-private and private stuff below this point 1.38 1.39 /**