emul/mini/src/main/java/java/lang/Class.java
branchemul
changeset 666 8338ab1991e6
parent 643 a2c0afa35c09
parent 658 578cea5b4359
child 747 ae352b763959
     1.1 --- a/emul/mini/src/main/java/java/lang/Class.java	Fri Feb 01 18:35:21 2013 +0100
     1.2 +++ b/emul/mini/src/main/java/java/lang/Class.java	Tue Feb 05 08:27:42 2013 +0100
     1.3 @@ -231,12 +231,14 @@
     1.4      }
     1.5      
     1.6      @JavaScriptBody(args = {"n", "c" }, body =
     1.7 -        "if (vm[c]) return vm[c].$class;\n"
     1.8 -      + "if (vm.loadClass) {\n"
     1.9 -      + "  vm.loadClass(n);\n"
    1.10 -      + "  if (vm[c]) return vm[c].$class;\n"
    1.11 +        "if (!vm[c]) {\n"
    1.12 +      + "  if (vm.loadClass) {\n"
    1.13 +      + "    vm.loadClass(n);\n"
    1.14 +      + "  }\n"
    1.15 +      + "  if (!vm[c]) return null;\n"
    1.16        + "}\n"
    1.17 -      + "return null;"
    1.18 +      + "vm[c](false);"
    1.19 +      + "return vm[c].$class;"
    1.20      )
    1.21      private static native Class<?> loadCls(String n, String c);
    1.22