Merging recent fixes in default branch async
authorJaroslav Tulach <jaroslav.tulach@netbeans.org>
Thu, 06 Mar 2014 21:53:38 +0100
branchasync
changeset 5810e33d61d89cc
parent 578 ec78a6d57560
parent 580 aed4c6a7d4b4
child 582 55688d308ce7
Merging recent fixes in default branch
json-tck/src/main/java/net/java/html/js/tests/Bodies.java
json-tck/src/main/java/net/java/html/js/tests/JavaScriptBodyTest.java
     1.1 --- a/boot/src/main/java/org/netbeans/html/boot/impl/JsClassLoader.java	Thu Mar 06 15:31:30 2014 +0100
     1.2 +++ b/boot/src/main/java/org/netbeans/html/boot/impl/JsClassLoader.java	Thu Mar 06 21:53:38 2014 +0100
     1.3 @@ -76,6 +76,9 @@
     1.4          if (name.startsWith("com.sun")) {
     1.5              return Class.forName(name);
     1.6          }
     1.7 +        if (name.startsWith("org.apidesign.html.context.spi")) {
     1.8 +            return Class.forName(name);
     1.9 +        }
    1.10          if (name.equals(JsClassLoader.class.getName())) {
    1.11              return JsClassLoader.class;
    1.12          }