Try harder to find the emulation classes
authorJaroslav Tulach <jaroslav.tulach@apidesign.org>
Thu, 16 May 2013 08:51:29 +0200
changeset 1098fcf1d05b0d39
parent 1097 8e42a376da73
child 1099 dcc7ab0f2692
child 1101 56abd247f421
Try harder to find the emulation classes
launcher/fx/src/main/java/org/apidesign/bck2brwsr/launcher/BaseHTTPLauncher.java
     1.1 --- a/launcher/fx/src/main/java/org/apidesign/bck2brwsr/launcher/BaseHTTPLauncher.java	Thu May 16 08:49:55 2013 +0200
     1.2 +++ b/launcher/fx/src/main/java/org/apidesign/bck2brwsr/launcher/BaseHTTPLauncher.java	Thu May 16 08:51:29 2013 +0200
     1.3 @@ -498,15 +498,21 @@
     1.4  
     1.5      class Res {
     1.6          public InputStream get(String resource) throws IOException {
     1.7 +            URL u = null;
     1.8              for (ClassLoader l : loaders) {
     1.9 -                URL u = null;
    1.10                  Enumeration<URL> en = l.getResources(resource);
    1.11                  while (en.hasMoreElements()) {
    1.12                      u = en.nextElement();
    1.13 +                    if (u.toExternalForm().matches("^.*emul.*rt\\.jar.*$")) {
    1.14 +                        return u.openStream();
    1.15 +                    }
    1.16                  }
    1.17 -                if (u != null) {
    1.18 -                    return u.openStream();
    1.19 +            }
    1.20 +            if (u != null) {
    1.21 +                if (u.toExternalForm().contains("rt.jar")) {
    1.22 +                    LOG.log(Level.WARNING, "Fallback to bootclasspath for {0}", u);
    1.23                  }
    1.24 +                return u.openStream();
    1.25              }
    1.26              throw new IOException("Can't find " + resource);
    1.27          }