diff -r fcf1d05b0d39 -r 06e7a74c72cf launcher/fx/src/main/java/org/apidesign/bck2brwsr/launcher/BaseHTTPLauncher.java --- a/launcher/fx/src/main/java/org/apidesign/bck2brwsr/launcher/BaseHTTPLauncher.java Thu May 16 08:51:29 2013 +0200 +++ b/launcher/fx/src/main/java/org/apidesign/bck2brwsr/launcher/BaseHTTPLauncher.java Tue May 28 21:49:38 2013 +0200 @@ -61,8 +61,8 @@ abstract class BaseHTTPLauncher extends Launcher implements Closeable, Callable { static final Logger LOG = Logger.getLogger(BaseHTTPLauncher.class.getName()); private static final InvocationContext END = new InvocationContext(null, null, null); - private final Set loaders = new LinkedHashSet<>(); - private final BlockingQueue methods = new LinkedBlockingQueue<>(); + private final Set loaders = new LinkedHashSet(); + private final BlockingQueue methods = new LinkedBlockingQueue(); private long timeOut; private final Res resources = new Res(); private final String cmd; @@ -112,7 +112,7 @@ server = s; try { launchServerAndBrwsr(s, simpleName); - } catch (URISyntaxException | InterruptedException ex) { + } catch (Exception ex) { throw new IOException(ex); } } @@ -124,7 +124,7 @@ HttpServer s = initServer(dir.getPath(), false); try { launchServerAndBrwsr(s, startpage); - } catch (URISyntaxException | InterruptedException ex) { + } catch (Exception ex) { throw new IOException(ex); } } @@ -237,7 +237,7 @@ conf.addHttpHandler(new HttpHandler() { int cnt; - List cases = new ArrayList<>(); + List cases = new ArrayList(); DynamicResourceHandler prev; @Override public void service(Request request, Response response) throws Exception { @@ -547,7 +547,8 @@ replace = args; } OutputStream os = response.getOutputStream(); - try (InputStream is = res.get(r)) { + try { + InputStream is = res.get(r); copyStream(is, os, request.getRequestURL().toString(), replace); } catch (IOException ex) { response.setDetailMessage(ex.getLocalizedMessage()); @@ -603,7 +604,9 @@ if (res.startsWith("/")) { res = res.substring(1); } - try (InputStream is = loader.get(res)) { + InputStream is = null; + try { + is = loader.get(res); response.setContentType("text/javascript"); Writer w = response.getWriter(); w.append("["); @@ -628,6 +631,10 @@ response.setStatus(HttpStatus.NOT_FOUND_404); response.setError(); response.setDetailMessage(ex.getMessage()); + } finally { + if (is != null) { + is.close(); + } } } }