Make sure we compile and run on dalvik preprocess
authorJaroslav Tulach <jaroslav.tulach@apidesign.org>
Mon, 25 Nov 2013 09:15:27 +0100
branchpreprocess
changeset 332386429032402
parent 331 72dda6af599b
child 333 92f39197f0d2
Make sure we compile and run on dalvik
boot/pom.xml
boot/src/main/java/org/apidesign/html/boot/impl/FnUtils.java
     1.1 --- a/boot/pom.xml	Sun Nov 24 15:39:55 2013 +0100
     1.2 +++ b/boot/pom.xml	Mon Nov 25 09:15:27 2013 +0100
     1.3 @@ -32,8 +32,8 @@
     1.4              <artifactId>maven-compiler-plugin</artifactId>
     1.5              <version>2.3.2</version>
     1.6              <configuration>
     1.7 -               <source>1.7</source>
     1.8 -               <target>1.7</target>
     1.9 +               <source>1.6</source>
    1.10 +               <target>1.6</target>
    1.11              </configuration>
    1.12           </plugin>
    1.13        </plugins>
     2.1 --- a/boot/src/main/java/org/apidesign/html/boot/impl/FnUtils.java	Sun Nov 24 15:39:55 2013 +0100
     2.2 +++ b/boot/src/main/java/org/apidesign/html/boot/impl/FnUtils.java	Mon Nov 25 09:15:27 2013 +0100
     2.3 @@ -21,6 +21,7 @@
     2.4  package org.apidesign.html.boot.impl;
     2.5  
     2.6  import java.io.Closeable;
     2.7 +import java.io.IOException;
     2.8  import java.io.InputStream;
     2.9  import java.io.InputStreamReader;
    2.10  import java.io.Reader;
    2.11 @@ -71,12 +72,19 @@
    2.12              return true;
    2.13          }
    2.14          Class<?> clazz;
    2.15 -        try (Closeable c = Fn.activate(new FnUtils())) {
    2.16 +        Closeable c = Fn.activate(new FnUtils());
    2.17 +        try {
    2.18              clazz = Class.forName(Test.class.getName(), true, l);
    2.19              final Object is = ((Callable<?>)clazz.newInstance()).call();
    2.20              return Boolean.TRUE.equals(is);
    2.21          } catch (Exception ex) {
    2.22              return false;
    2.23 +        } finally {
    2.24 +            try {
    2.25 +                c.close();
    2.26 +            } catch (IOException ex) {
    2.27 +                throw new IllegalStateException(ex);
    2.28 +            }
    2.29          }
    2.30      }
    2.31