# HG changeset patch # User Jaroslav Tulach # Date 1360011753 -3600 # Node ID 578cea5b4359bb8c9f17b8e9f5644678b15a403d # Parent 044c727324242046a3f3e1b8561c6c29c9394a0c Need to initialize the class before returning its $class structure diff -r 044c72732424 -r 578cea5b4359 emul/mini/src/main/java/java/lang/Class.java --- a/emul/mini/src/main/java/java/lang/Class.java Sun Feb 03 23:18:47 2013 +0100 +++ b/emul/mini/src/main/java/java/lang/Class.java Mon Feb 04 22:02:33 2013 +0100 @@ -231,12 +231,14 @@ } @JavaScriptBody(args = {"n", "c" }, body = - "if (vm[c]) return vm[c].$class;\n" - + "if (vm.loadClass) {\n" - + " vm.loadClass(n);\n" - + " if (vm[c]) return vm[c].$class;\n" + "if (!vm[c]) {\n" + + " if (vm.loadClass) {\n" + + " vm.loadClass(n);\n" + + " }\n" + + " if (!vm[c]) return null;\n" + "}\n" - + "return null;" + + "vm[c](false);" + + "return vm[c].$class;" ) private static native Class loadCls(String n, String c);