Don't forget to add to classes list jdk8
authorJaroslav Tulach <jaroslav.tulach@apidesign.org>
Sat, 13 Sep 2014 15:37:01 +0200
branchjdk8
changeset 16812082d4c4bf11
parent 1680 3b553acbd931
child 1682 0e2fa0438a78
Don't forget to add to classes list
rt/aot/src/main/java/org/apidesign/bck2brwsr/aot/Bck2BrwsrJars.java
     1.1 --- a/rt/aot/src/main/java/org/apidesign/bck2brwsr/aot/Bck2BrwsrJars.java	Sat Sep 13 14:37:49 2014 +0200
     1.2 +++ b/rt/aot/src/main/java/org/apidesign/bck2brwsr/aot/Bck2BrwsrJars.java	Sat Sep 13 15:37:01 2014 +0200
     1.3 @@ -220,10 +220,20 @@
     1.4                  try (InputStream is = this.get(n)) {
     1.5                      Map<String, byte[]> conv = proc.process(n, readFrom(is), this);
     1.6                      if (conv != null) {
     1.7 -                        if (!conv.containsKey(n)) {
     1.8 +                        boolean found = false;
     1.9 +                        for (Map.Entry<String, byte[]> entrySet : conv.entrySet()) {
    1.10 +                            String res = entrySet.getKey();
    1.11 +                            byte[] bytes = entrySet.getValue();
    1.12 +                            if (res.equals(n)) {
    1.13 +                                found = true;
    1.14 +                            }
    1.15 +                            assert res.endsWith(".class");
    1.16 +                            converted.put(res, bytes);
    1.17 +                            classes.add(res.substring(0, res.length() - 6));
    1.18 +                        }
    1.19 +                        if (!found) {
    1.20                              throw new IOException("Cannot find " + n + " among " + conv);
    1.21                          }
    1.22 -                        converted.putAll(conv);
    1.23                          return;
    1.24                      }
    1.25                  }