diff options
author | jfrijters <jfrijters> | 2013-02-23 12:27:18 +0400 |
---|---|---|
committer | jfrijters <jfrijters> | 2013-02-23 12:27:18 +0400 |
commit | 346a9ee8442900c750291ef0a9ae4303ba6e590e (patch) | |
tree | 0389b8a97fcdc03832102a07149b1c2610d2056b /openjdk/java | |
parent | f520a240dd6e1a2f2b9ba99929460c459523c547 (diff) |
Moved AssemblyClassLoader package definition to runtime.
Diffstat (limited to 'openjdk/java')
-rw-r--r-- | openjdk/java/lang/LangHelper.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/openjdk/java/lang/LangHelper.java b/openjdk/java/lang/LangHelper.java index f4fc99ff..cc62d2cb 100644 --- a/openjdk/java/lang/LangHelper.java +++ b/openjdk/java/lang/LangHelper.java @@ -46,7 +46,7 @@ public class LangHelper if (!addedSystemPackages) { addedSystemPackages = true; - String[] pkgs = AssemblyClassLoader.GetPackages(getBootstrapAssembly()); + String[] pkgs = getBootClassPackages(); for (int i = 0; i < pkgs.length; i++) { pkgMap.put(pkgs[i], @@ -62,6 +62,8 @@ public class LangHelper } } } + + private static native String[] getBootClassPackages(); /* this method gets called by Package.getSystemPackage() via a redefined method in map.xml */ static Package getSystemPackage(Map pkgs, String name) @@ -84,11 +86,6 @@ public class LangHelper } } - private static cli.System.Reflection.Assembly getBootstrapAssembly() - { - return ikvm.runtime.Util.getInstanceTypeFromClass(Object.class).get_Assembly(); - } - public static sun.misc.JavaLangAccess getJavaLangAccess() { return new sun.misc.JavaLangAccess() { |