This is an automated email from the git hooks/post-receive script. sylvestre pushed a commit to branch master in repository jscover.
commit 5b1202d59589a64cb7aa7c4795012468b4c0548f Author: tntim96 <[email protected]> Date: Sat Jun 7 15:54:59 2014 +1000 Tidy resource usage and imports --- src/main/java/jscover/Main.java | 2 ++ src/main/java/jscover/server/SimpleWebServer.java | 15 ++++++++++----- src/main/java/jscover/server/WebDaemon.java | 9 +++------ .../HtmlServerUnloadedJSProxyOnlyInstrumentRegTest.java | 7 +++++-- .../jscover/server/HtmlServerUnloadedJSProxyTest.java | 7 +++++-- .../server/HtmlServerUnloadedJSProxyUriToFileTest.java | 7 +++++-- .../java/jscover/server/HtmlUnitJSTest.java | 2 -- .../java/jscover/server/HtmlUnitProxyTest.java | 7 +++++-- .../java/jscover/server/WeirdHttpServer.java | 15 ++++++++++----- src/test/java/jscover/MainParsingTest.java | 1 - src/test/java/jscover/server/HttpServerDriver.java | 15 ++++++++++----- .../jscover/server/InstrumentingRequestHandlerDriver.java | 13 +++++++++---- src/test/java/jscover/util/ReflectionUtils.java | 2 +- 13 files changed, 65 insertions(+), 37 deletions(-) diff --git a/src/main/java/jscover/Main.java b/src/main/java/jscover/Main.java index aab5e05..4b9c77b 100644 --- a/src/main/java/jscover/Main.java +++ b/src/main/java/jscover/Main.java @@ -513,6 +513,8 @@ public class Main { throw new RuntimeException(e); } catch (Exception e) { throw new RuntimeException(e); + } finally { + webDaemon.stop(); } } } diff --git a/src/main/java/jscover/server/SimpleWebServer.java b/src/main/java/jscover/server/SimpleWebServer.java index a4a5bae..38581c2 100644 --- a/src/main/java/jscover/server/SimpleWebServer.java +++ b/src/main/java/jscover/server/SimpleWebServer.java @@ -350,11 +350,16 @@ public class SimpleWebServer { private static boolean running = true; public static void main(String args[]) throws Exception { - ServerSocket Server = new ServerSocket(Integer.valueOf(args[1])); - File wwwRoot = new File(args[0]); - while (running) { - Socket socket = Server.accept(); - (new HttpServer(socket, wwwRoot, "simpleWebServer")).start(); + ServerSocket server = null; + try { + server = new ServerSocket(Integer.valueOf(args[1])); + File wwwRoot = new File(args[0]); + while (running) { + Socket socket = server.accept(); + (new HttpServer(socket, wwwRoot, "simpleWebServer")).start(); + } + } finally { + server.close(); } } } diff --git a/src/main/java/jscover/server/WebDaemon.java b/src/main/java/jscover/server/WebDaemon.java index 35b7b7c..a7d3a51 100644 --- a/src/main/java/jscover/server/WebDaemon.java +++ b/src/main/java/jscover/server/WebDaemon.java @@ -342,12 +342,12 @@ Public License instead of this License. package jscover.server; +import jscover.util.IoUtils; import jscover.util.LoggerUtils; import java.io.IOException; import java.net.ServerSocket; import java.net.Socket; -import java.net.SocketException; import java.util.logging.Logger; import static java.util.logging.Level.INFO; @@ -356,6 +356,7 @@ import static java.util.logging.Level.WARNING; public class WebDaemon { private static final Logger logger = Logger.getLogger(WebDaemon.class.getName()); private LoggerUtils loggerUtils = LoggerUtils.getInstance(); + private IoUtils ioUtils = IoUtils.getInstance(); private ServerSocket serverSocket; public boolean running = true; @@ -372,10 +373,6 @@ public class WebDaemon { public void stop() { running = false; logger.log(WARNING, "Stopping JSCover"); - try { - serverSocket.close(); - } catch (IOException e) { - e.printStackTrace(); - } + ioUtils.closeQuietly(serverSocket); } } diff --git a/src/test-acceptance/java/jscover/server/HtmlServerUnloadedJSProxyOnlyInstrumentRegTest.java b/src/test-acceptance/java/jscover/server/HtmlServerUnloadedJSProxyOnlyInstrumentRegTest.java index 0f69670..8fc5578 100644 --- a/src/test-acceptance/java/jscover/server/HtmlServerUnloadedJSProxyOnlyInstrumentRegTest.java +++ b/src/test-acceptance/java/jscover/server/HtmlServerUnloadedJSProxyOnlyInstrumentRegTest.java @@ -405,15 +405,18 @@ public class HtmlServerUnloadedJSProxyOnlyInstrumentRegTest { if (webServer == null) { webServer = new Thread(new Runnable() { public void run() { + ServerSocket server = null; try { - ServerSocket Server = new ServerSocket(9001); + server = new ServerSocket(9001); File wwwRoot = new File("src/test-integration/resources/jsSearch"); while (true) { - Socket socket = Server.accept(); + Socket socket = server.accept(); (new HttpServer(socket, wwwRoot, "testVersion")).start(); } } catch (IOException e) { throw new RuntimeException(e); + } finally { + ioUtils.closeQuietly(server); } } }); diff --git a/src/test-acceptance/java/jscover/server/HtmlServerUnloadedJSProxyTest.java b/src/test-acceptance/java/jscover/server/HtmlServerUnloadedJSProxyTest.java index 41e7ac4..44d19f8 100644 --- a/src/test-acceptance/java/jscover/server/HtmlServerUnloadedJSProxyTest.java +++ b/src/test-acceptance/java/jscover/server/HtmlServerUnloadedJSProxyTest.java @@ -388,15 +388,18 @@ public class HtmlServerUnloadedJSProxyTest extends HtmlServerUnloadedJSTest { if (webServer == null) { webServer = new Thread(new Runnable() { public void run() { + ServerSocket server = null; try { - ServerSocket Server = new ServerSocket(9001); + server = new ServerSocket(9001); File wwwRoot = new File("src/test-integration/resources/jsSearch"); while (true) { - Socket socket = Server.accept(); + Socket socket = server.accept(); (new HttpServer(socket, wwwRoot, "testVersion")).start(); } } catch (IOException e) { throw new RuntimeException(e); + } finally { + ioUtils.closeQuietly(server); } } }); diff --git a/src/test-acceptance/java/jscover/server/HtmlServerUnloadedJSProxyUriToFileTest.java b/src/test-acceptance/java/jscover/server/HtmlServerUnloadedJSProxyUriToFileTest.java index 61133e5..affa486 100644 --- a/src/test-acceptance/java/jscover/server/HtmlServerUnloadedJSProxyUriToFileTest.java +++ b/src/test-acceptance/java/jscover/server/HtmlServerUnloadedJSProxyUriToFileTest.java @@ -400,15 +400,18 @@ public class HtmlServerUnloadedJSProxyUriToFileTest extends HtmlServerUnloadedJS if (webServer == null) { webServer = new Thread(new Runnable() { public void run() { + ServerSocket server = null; try { - ServerSocket Server = new ServerSocket(9001); + server = new ServerSocket(9001); File wwwRoot = new File("src/test-integration/resources/jsSearch"); while (true) { - Socket socket = Server.accept(); + Socket socket = server.accept(); (new WeirdHttpServer(socket, wwwRoot, "testVersion")).start(); } } catch (IOException e) { throw new RuntimeException(e); + } finally { + ioUtils.closeQuietly(server); } } }); diff --git a/src/test-acceptance/java/jscover/server/HtmlUnitJSTest.java b/src/test-acceptance/java/jscover/server/HtmlUnitJSTest.java index 969678e..4458a8d 100644 --- a/src/test-acceptance/java/jscover/server/HtmlUnitJSTest.java +++ b/src/test-acceptance/java/jscover/server/HtmlUnitJSTest.java @@ -342,10 +342,8 @@ Public License instead of this License. package jscover.server; -import com.gargoylesoftware.htmlunit.BrowserVersion; import com.gargoylesoftware.htmlunit.ScriptResult; import com.gargoylesoftware.htmlunit.WebClient; -import com.gargoylesoftware.htmlunit.html.HtmlElement; import com.gargoylesoftware.htmlunit.html.HtmlPage; import com.gargoylesoftware.htmlunit.html.HtmlSpan; import jscover.Main; diff --git a/src/test-acceptance/java/jscover/server/HtmlUnitProxyTest.java b/src/test-acceptance/java/jscover/server/HtmlUnitProxyTest.java index ebdb742..fc480b9 100644 --- a/src/test-acceptance/java/jscover/server/HtmlUnitProxyTest.java +++ b/src/test-acceptance/java/jscover/server/HtmlUnitProxyTest.java @@ -389,15 +389,18 @@ public class HtmlUnitProxyTest extends HtmlUnitServerTest { if (webServer == null) { webServer = new Thread(new Runnable() { public void run() { + ServerSocket server = null; try { - ServerSocket Server = new ServerSocket(9001); + server = new ServerSocket(9001); File wwwRoot = new File("src/test-acceptance/resources"); while (true) { - Socket socket = Server.accept(); + Socket socket = server.accept(); (new HttpServer(socket, wwwRoot, "testVersion")).start(); } } catch (IOException e) { throw new RuntimeException(e); + } finally { + ioUtils.closeQuietly(server); } } }); diff --git a/src/test-acceptance/java/jscover/server/WeirdHttpServer.java b/src/test-acceptance/java/jscover/server/WeirdHttpServer.java index 1bbff00..f3e428e 100644 --- a/src/test-acceptance/java/jscover/server/WeirdHttpServer.java +++ b/src/test-acceptance/java/jscover/server/WeirdHttpServer.java @@ -352,11 +352,16 @@ import java.net.Socket; public class WeirdHttpServer extends HttpServer { public static void main(String[] args) throws Exception { - ServerSocket Server = new ServerSocket(80); - File wwwRoot = new File("src/test-integration/resources/jsSearch"); - while (true) { - Socket socket = Server.accept(); - (new WeirdHttpServer(socket, wwwRoot, "testVersion")).start(); + ServerSocket server = null; + try { + server = new ServerSocket(80); + File wwwRoot = new File("src/test-integration/resources/jsSearch"); + while (true) { + Socket socket = server.accept(); + (new WeirdHttpServer(socket, wwwRoot, "testVersion")).start(); + } + } finally { + server.close(); } } diff --git a/src/test/java/jscover/MainParsingTest.java b/src/test/java/jscover/MainParsingTest.java index 2bb025a..d110c5e 100644 --- a/src/test/java/jscover/MainParsingTest.java +++ b/src/test/java/jscover/MainParsingTest.java @@ -348,7 +348,6 @@ import org.junit.Test; import java.io.IOException; import java.util.ArrayList; -import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/src/test/java/jscover/server/HttpServerDriver.java b/src/test/java/jscover/server/HttpServerDriver.java index 0372e9c..edb1e48 100644 --- a/src/test/java/jscover/server/HttpServerDriver.java +++ b/src/test/java/jscover/server/HttpServerDriver.java @@ -350,11 +350,16 @@ public class HttpServerDriver { private static boolean running = true; public static void main(String args[]) throws Exception { - ServerSocket Server = new ServerSocket(80); - File wwwRoot = new File("."); - while (running) { - Socket socket = Server.accept(); - (new HttpServer(socket, wwwRoot, "testVersion")).start(); + ServerSocket server = null; + try { + server = new ServerSocket(80); + File wwwRoot = new File("."); + while (running) { + Socket socket = server.accept(); + (new HttpServer(socket, wwwRoot, "testVersion")).start(); + } + } finally { + server.close(); } } } diff --git a/src/test/java/jscover/server/InstrumentingRequestHandlerDriver.java b/src/test/java/jscover/server/InstrumentingRequestHandlerDriver.java index 657089c..b21f8fb 100644 --- a/src/test/java/jscover/server/InstrumentingRequestHandlerDriver.java +++ b/src/test/java/jscover/server/InstrumentingRequestHandlerDriver.java @@ -360,10 +360,15 @@ public class InstrumentingRequestHandlerDriver { properties.put("version", "test"); configuration.setProperties(properties); boolean running = true; - ServerSocket Server = new ServerSocket(configuration.getPort()); - while (running) { - Socket socket = Server.accept(); - (new InstrumentingRequestHandler(socket, configuration)).start(); + ServerSocket server = null; + try { + server = new ServerSocket(configuration.getPort()); + while (running) { + Socket socket = server.accept(); + (new InstrumentingRequestHandler(socket, configuration)).start(); + } + } finally { + server.close(); } } diff --git a/src/test/java/jscover/util/ReflectionUtils.java b/src/test/java/jscover/util/ReflectionUtils.java index edd610b..7442db5 100644 --- a/src/test/java/jscover/util/ReflectionUtils.java +++ b/src/test/java/jscover/util/ReflectionUtils.java @@ -365,7 +365,7 @@ public class ReflectionUtils { } } - public static void setField(Object object, Class clazz, String fieldName, Object value) { + public static void setField(Object object, Class<?> clazz, String fieldName, Object value) { try { Field field = clazz.getDeclaredField(fieldName); field.setAccessible(true); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jscover.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
