# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@apidesign.org>
# Date 1356634216 -3600
# Node ID f69966d2e6cbc135f4a5e6ace1d971f34ee5c924
# Parent  e1f64baf73b98534b259072d68cff1cbbfa62efa
Don't throw NPEs when executing the calculator demo

diff -r e1f64baf73b9 -r f69966d2e6cb launcher/src/main/java/org/apidesign/bck2brwsr/launcher/Bck2BrwsrLauncher.java
--- a/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/Bck2BrwsrLauncher.java	Thu Dec 27 19:39:58 2012 +0100
+++ b/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/Bck2BrwsrLauncher.java	Thu Dec 27 19:50:16 2012 +0100
@@ -188,7 +188,7 @@
         for (;;) {
             int prev = methods.size();
             try {
-                if (wait.await(timeOut, TimeUnit.MILLISECONDS)) {
+                if (wait != null && wait.await(timeOut, TimeUnit.MILLISECONDS)) {
                     break;
                 }
             } catch (InterruptedException ex) {
@@ -275,6 +275,9 @@
     }
     
     private void stopServerAndBrwsr(HttpServer server, Object[] brwsr) throws IOException {
+        if (brwsr == null) {
+            return;
+        }
         Process process = (Process)brwsr[0];
         
         server.stop();