diff -r bd80952bfd11 -r 892dcb178737 launcher/fx/src/main/java/org/apidesign/bck2brwsr/launcher/BaseHTTPLauncher.java --- a/launcher/fx/src/main/java/org/apidesign/bck2brwsr/launcher/BaseHTTPLauncher.java Sun Apr 28 21:17:04 2013 +0200 +++ b/launcher/fx/src/main/java/org/apidesign/bck2brwsr/launcher/BaseHTTPLauncher.java Sun May 05 18:16:43 2013 +0200 @@ -35,6 +35,7 @@ import java.util.List; import java.util.Set; import java.util.concurrent.BlockingQueue; +import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; @@ -55,7 +56,7 @@ * Supports execution in native browser as well as Java's internal * execution engine. */ -abstract class BaseHTTPLauncher extends Launcher implements Closeable { +abstract class BaseHTTPLauncher extends Launcher implements Closeable, Callable { private 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<>(); @@ -106,6 +107,7 @@ String prefix = startpage.substring(0, last); String simpleName = startpage.substring(last); s.getServerConfiguration().addHttpHandler(new SubTree(resources, prefix), "/"); + server = s; try { launchServerAndBrwsr(s, simpleName); } catch (URISyntaxException | InterruptedException ex) { @@ -422,6 +424,11 @@ } @Override + public HttpServer call() throws Exception { + return server; + } + + @Override public void close() throws IOException { shutdown(); }