Merge pull request #57 from kamshory/Multiple-Modem

Prevent Duplicated WebSocket Client

src/main/java/com/planetbiru/ClientReceiverWS.java

@@ -1,6 +1,7 @@
 package com.planetbiru;
 
 import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -79,4 +80,10 @@ public void init()
 		this.tool.start();
 	}
 
+	@PreDestroy
+	public void stopThread()
+	{
+		this.tool.stopThread();
+	}
+
 }

src/main/java/com/planetbiru/receiver/ws/WebSocketClient.java

@@ -71,6 +71,10 @@ public void run()
 		}
 		while(!connected && !isStoped());
 	}
+	public void stopThreade()
+	{
+		this.stoped = true;
+	}
 	public static void sleep(long interval)
 	{
 		try 

src/main/java/com/planetbiru/receiver/ws/WebSocketTool.java

@@ -5,6 +5,7 @@
 public class WebSocketTool extends Thread{
 	private WebSocketClient client;
 	private long reconnectDelay = 10000;
+	private boolean stopend = false;
 
 	public WebSocketTool(long reconnectDelay)
 	{
@@ -21,19 +22,28 @@ public void run()
 			this.client.start();
 		}
 	}
+
+	public void stopThread()
+	{
+		this.stopend = true;
+		this.client.stopThreade();
+	}
 
 	public void restartThread() {
-		try 
+		if(!this.stopend)
 		{
-			Thread.sleep(this.reconnectDelay);
-		} 
-		catch (InterruptedException e) 
-		{
-			Thread.currentThread().interrupt();
+			try 
+			{
+				Thread.sleep(this.reconnectDelay);
+			} 
+			catch (InterruptedException e) 
+			{
+				Thread.currentThread().interrupt();
+			}
+			this.client = new WebSocketClient(this);
+			this.client.setStoped(false);
+			this.client.start();	
 		}
-		this.client = new WebSocketClient(this);
-		this.client.setStoped(false);
-		this.client.start();	
 	}
 }