diff options
Diffstat (limited to 'same/src/main/java/com/orbekk/same/http')
3 files changed, 12 insertions, 4 deletions
diff --git a/same/src/main/java/com/orbekk/same/http/JettyServerContainer.java b/same/src/main/java/com/orbekk/same/http/JettyServerContainer.java index c15d94d..16d7033 100644 --- a/same/src/main/java/com/orbekk/same/http/JettyServerContainer.java +++ b/same/src/main/java/com/orbekk/same/http/JettyServerContainer.java @@ -55,7 +55,11 @@ public class JettyServerContainer implements ServerContainer { logger.info("Server stopped."); } - public void join() throws InterruptedException { - server.join(); + public void join() { + try { + server.join(); + } catch (InterruptedException e) { + return; + } } } diff --git a/same/src/main/java/com/orbekk/same/http/ServerContainer.java b/same/src/main/java/com/orbekk/same/http/ServerContainer.java index 6f87910..b69adbf 100644 --- a/same/src/main/java/com/orbekk/same/http/ServerContainer.java +++ b/same/src/main/java/com/orbekk/same/http/ServerContainer.java @@ -4,5 +4,5 @@ public interface ServerContainer { public abstract int getPort(); public abstract void start() throws Exception; public abstract void stop() throws Exception; - public abstract void join() throws Exception; + public abstract void join(); }
\ No newline at end of file diff --git a/same/src/main/java/com/orbekk/same/http/TjwsServerContainer.java b/same/src/main/java/com/orbekk/same/http/TjwsServerContainer.java index ec2f2a2..2aa7efd 100644 --- a/same/src/main/java/com/orbekk/same/http/TjwsServerContainer.java +++ b/same/src/main/java/com/orbekk/same/http/TjwsServerContainer.java @@ -1,5 +1,7 @@ package com.orbekk.same.http; +import java.util.Properties; + import javax.servlet.http.HttpServlet; import org.slf4j.Logger; @@ -22,8 +24,10 @@ public class TjwsServerContainer implements ServerContainer { private MyServer server; public static TjwsServerContainer create(int port) { + Properties properties = new Properties(); + properties.put(Serve.ARG_PORT, port); MyServer server = new MyServer(); - server.setAttribute(Serve.ARG_PORT, port); + server.arguments = properties; return new TjwsServerContainer(server); } |