fixes #68 & fixes #67

2 files changed, 7 insertions, 15 deletions

diff --git a/src/main/java/de/torui/coflsky/network/WSClient.java b/src/main/java/de/torui/coflsky/network/WSClient.java
index 46fdbb4..f306751 100644
--- a/src/main/java/de/torui/coflsky/network/WSClient.java
+++ b/src/main/java/de/torui/coflsky/network/WSClient.java
@@ -38,7 +38,7 @@ public class WSClient extends WebSocketAdapter {
 		})*/.create();
 	}
 	public URI uri;
-	public WebSocket socket;
+	private WebSocket socket;
 	public boolean shouldRun = false;
 	public WebSocketState currentState = WebSocketState.CLOSED;
 	
@@ -79,19 +79,10 @@ public class WSClient extends WebSocketAdapter {
 	
 	public void stop() {
 		System.out.println("Closing Socket");
-	//	socket.sendClose();
+		if(socket == null)
+			return;
 		socket.clearListeners();
-	
 		socket.disconnect();
-		/*try {
-			socket.getConnectedSocket().close();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (WebSocketException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}*/
 		System.out.println("Socket closed");
 
 	}
diff --git a/src/main/java/de/torui/coflsky/network/WSClientWrapper.java b/src/main/java/de/torui/coflsky/network/WSClientWrapper.java
index 044a3e2..eccc0e7 100644
--- a/src/main/java/de/torui/coflsky/network/WSClientWrapper.java
+++ b/src/main/java/de/torui/coflsky/network/WSClientWrapper.java
@@ -35,7 +35,6 @@ public class WSClientWrapper {
     }
     
     public void restartWebsocketConnection() {
-    	socket.socket.clearListeners();
     	socket.stop();
     	
     	System.out.println("Sleeping...");
@@ -103,9 +102,11 @@ public class WSClientWrapper {
 			String coflSessionID = CoflSessionManager.GetCoflSession(username).SessionUUID;
 			
 			uri += "&SId=" + coflSessionID;	
-	    	
+
+			if(socket != null)
+				socket.stop();
 			socket = new WSClient(URI.create(uri));
-			
+			isRunning = false;
 			boolean successfull = start();
 			if(successfull) {
 				socket.shouldRun = true;