diff options
author | jfrijters <jfrijters> | 2013-02-23 12:47:55 +0400 |
---|---|---|
committer | jfrijters <jfrijters> | 2013-02-23 12:47:55 +0400 |
commit | 162e81bddafea662b342ef78a7d53995a87551ec (patch) | |
tree | f788fb29c4acd17169c2b0489d279d4ffa0862f5 /openjdk | |
parent | 346a9ee8442900c750291ef0a9ae4303ba6e590e (diff) |
Simplified AssemblyClassLoader construction.
Diffstat (limited to 'openjdk')
-rw-r--r-- | openjdk/java/lang/ClassLoader.java | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/openjdk/java/lang/ClassLoader.java b/openjdk/java/lang/ClassLoader.java index 3477666b..8162ba81 100644 --- a/openjdk/java/lang/ClassLoader.java +++ b/openjdk/java/lang/ClassLoader.java @@ -286,7 +286,10 @@ public abstract class ClassLoader { return null; } - private ClassLoader(Void unused, ClassLoader parent) { + // [IKVM] this normally private constructor is also used by ikvm.runtime.AssemblyClassLoader + // to construct an assembly class loader without doing a security check + @ikvm.lang.Internal + protected ClassLoader(Void unused, ClassLoader parent) { if (parent != null) { parent.check(); } @@ -330,20 +333,6 @@ public abstract class ClassLoader { this(checkCreateClassLoader(), parent); } - // private constructor for use by ikvm.runtime.AssemblyClassLoader - // (to skip the security manager check) - @ikvm.lang.Internal - protected ClassLoader(ClassLoader parent, SecurityManager security) { - this(checkCreateAssemblyClassLoader(security), parent); - } - - private static Void checkCreateAssemblyClassLoader(SecurityManager security) { - if (security != null) { - security.checkCreateClassLoader(); - } - return null; - } - /** * Creates a new class loader using the <tt>ClassLoader</tt> returned by * the method {@link #getSystemClassLoader() |