diff options
| author | Leif Åstrand <leif@vaadin.com> | 2014-02-12 15:49:31 +0200 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2014-02-12 15:49:49 +0200 |
| commit | 42f2387165471d08bbd24d4c3ae4a271d2cda4c5 (patch) | |
| tree | 4418a7610edf326d308f65ee0d79d4d09c341a93 /uitest/src/com/vaadin/launcher | |
| parent | 50381a619458017d69b044435a22fae457a5d4c1 (diff) | |
| parent | 40e07d0172532ebf5750b8c2aab5ec892e42cdab (diff) | |
| download | vaadin-framework-42f2387165471d08bbd24d4c3ae4a271d2cda4c5.tar.gz vaadin-framework-42f2387165471d08bbd24d4c3ae4a271d2cda4c5.zip | |
Merge remote-tracking branch 'origin/master' into grid
Change-Id: I8f1f412eeb450688bba58b715eba6db9e4ae43ae
Diffstat (limited to 'uitest/src/com/vaadin/launcher')
| -rw-r--r-- | uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java | 2 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java b/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java index a2f3c59f07..47d3a19fde 100644 --- a/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java +++ b/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java @@ -280,7 +280,7 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet { } - throw new ClassNotFoundException(); + throw new ClassNotFoundException(baseName); } private Logger getLogger() { diff --git a/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java b/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java index a8d639cbc8..20e187c187 100644 --- a/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java +++ b/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java @@ -217,7 +217,6 @@ public class DevelopmentServerLauncher { Socket accept = serverSocket.accept(); // First stop listening to the port serverSocket.close(); - final Thread stopThread = Thread.currentThread(); // Start a thread that kills the JVM if // server.stop() doesn't have any effect |