Make SocketThread daemon flag configurable via constructors

ivkos · ivkos · commit 56e5e335f887 · 2017-07-01T12:18:08.000+03:00
diff --git a/src/main/java/de/taimos/gpsd4java/backend/GPSdEndpoint.java b/src/main/java/de/taimos/gpsd4java/backend/GPSdEndpoint.java
@@ -65,6 +65,8 @@ public class GPSdEndpoint {
 	
 	private SocketThread listenThread;
 	
+	private final boolean daemon;
+	
 	private final List<IObjectListener> listeners = new ArrayList<IObjectListener>(1);
 	
 	private IGPSObject asyncResult = null;
@@ -88,11 +90,13 @@ public class GPSdEndpoint {
 	 *
 	 * @param server       the server name or IP
 	 * @param port         the server port
-	 * @param resultParser
+	 * @param resultParser the result parser
+	 * @param daemon       whether to start the underlying socket thread as a daemon, as defined in {@link Thread#setDaemon}  
 	 * @throws UnknownHostException
 	 * @throws IOException
 	 */
-	public GPSdEndpoint(final String server, final int port, final AbstractResultParser resultParser) throws UnknownHostException, IOException {
+	public GPSdEndpoint(final String server, final int port, final AbstractResultParser resultParser, final boolean daemon) 
+			throws UnknownHostException, IOException {
 		this.server = server;
 		this.port = port;
 		if (server == null) {
@@ -109,13 +113,28 @@ public GPSdEndpoint(final String server, final int port, final AbstractResultPar
 		this.in = new BufferedReader(new InputStreamReader(this.socket.getInputStream()));
 		this.out = new BufferedWriter(new OutputStreamWriter(this.socket.getOutputStream()));
 		this.resultParser = resultParser;
+		
+		this.daemon = daemon;
+	}
+	
+	/**
+	 * Instantiate this class to connect to a GPSd server
+	 *
+	 * @param server       the server name or IP
+	 * @param port         the server port
+	 * @param resultParser the result parser
+	 * @throws UnknownHostException
+	 * @throws IOException
+	 */
+	public GPSdEndpoint(final String server, final int port, final AbstractResultParser resultParser) throws UnknownHostException, IOException {
+		this(server, port, resultParser, true);
 	}
 	
 	/**
 	 * start the endpoint
 	 */
 	public void start() {
-		this.listenThread = new SocketThread(this.in, this, this.resultParser);
+		this.listenThread = new SocketThread(this.in, this, this.resultParser, this.daemon);
 		this.listenThread.start();
 	}
 	
@@ -324,7 +343,7 @@ void handleDisconnected() throws IOException {
 			this.in = new BufferedReader(new InputStreamReader(this.socket.getInputStream()));
 			this.out = new BufferedWriter(new OutputStreamWriter(this.socket.getOutputStream()));
 			
-			this.listenThread = new SocketThread(this.in, this, this.resultParser);
+			this.listenThread = new SocketThread(this.in, this, this.resultParser, this.daemon);
 			this.listenThread.start();
 			if (lastWatch != null) { // restore watch if we had one.
 				this.syncCommand(lastWatch, WatchObject.class);
diff --git a/src/main/java/de/taimos/gpsd4java/backend/SocketThread.java b/src/main/java/de/taimos/gpsd4java/backend/SocketThread.java
@@ -47,9 +47,11 @@ public class SocketThread extends Thread {
 	/**
 	 * @param reader       the socket input
 	 * @param endpoint     the endpoint
-	 * @param resultParser
+	 * @param resultParser the result parser
+	 * @param daemon       whether to configure the thread as a daemon, as defined in {@link Thread#setDaemon}
 	 */
-	public SocketThread(final BufferedReader reader, final GPSdEndpoint endpoint, final AbstractResultParser resultParser) {
+	public SocketThread(final BufferedReader reader, final GPSdEndpoint endpoint, 
+							  final AbstractResultParser resultParser, final boolean daemon) {
 		if (reader == null) {
 			throw new IllegalArgumentException("reader can not be null!");
 		}
@@ -64,9 +66,19 @@ public SocketThread(final BufferedReader reader, final GPSdEndpoint endpoint, fi
 		this.endpoint = endpoint;
 		this.resultParser = resultParser;
 		
+		this.setDaemon(daemon);
 		this.setName("GPS Socket Thread");
 	}
 	
+	/**
+	 * @param reader			the socket input
+	 * @param endpoint		the endpoint
+	 * @param resultParser	the result parser
+	 */
+	public SocketThread(final BufferedReader reader, final GPSdEndpoint endpoint, final AbstractResultParser resultParser) {
+		this(reader, endpoint, resultParser, true);
+	}
+	
 	@Override
 	public void run() {
 		while (this.running.get()) {
