1 files changed, 4 insertions, 7 deletions

diff --git a/src/main/java/de/bwlehrpool/bwlp_guac/AvailableClient.java b/src/main/java/de/bwlehrpool/bwlp_guac/AvailableClient.java
index 6126e77..0a9e8ec 100644
--- a/src/main/java/de/bwlehrpool/bwlp_guac/AvailableClient.java
+++ b/src/main/java/de/bwlehrpool/bwlp_guac/AvailableClient.java
@@ -16,7 +16,7 @@ public class AvailableClient implements Cloneable {
 
 	private static final AtomicLong CON_ID = new AtomicLong();
 
-	public ArrayList<JsonLocation> locationList = new ArrayList<JsonLocation>();
+	public ArrayList<JsonGroup> groupList = new ArrayList<JsonGroup>();
 
 	private final String clientip;
 
@@ -28,8 +28,6 @@ public class AvailableClient implements Cloneable {
 
 	private String inUseBy;
 
-	private WrappedConnection connection;
-
 	private long deadline;
 
 	private long lastConnectionCheck;
@@ -59,7 +57,6 @@ public class AvailableClient implements Cloneable {
 				if (this.inUseBy != null) {
 					LOGGER.info("Client " + this + " is available again");
 					this.inUseBy = null;
-					this.connection = null;
 				}
 			}
 			this.lastConnectionCheck = 0;
@@ -76,7 +73,6 @@ public class AvailableClient implements Cloneable {
 		if (this.inUseBy != null || this.password == null || this.state != State.IDLE || user == null)
 			return false;
 		this.inUseBy = user;
-		this.connection = new WrappedConnection(this.clientip + "/" + CON_ID.incrementAndGet(), this);
 		this.state = State.OCCUPIED;
 		return true;
 	}
@@ -87,7 +83,7 @@ public class AvailableClient implements Cloneable {
 
 	public synchronized WrappedConnection getConnection(String expectedOwner) {
 		if (isInUseBy(expectedOwner))
-			return this.connection;
+			return new WrappedConnection(this.clientip + "/" + CON_ID.incrementAndGet(), this);
 		return null;
 	}
 
@@ -95,7 +91,8 @@ public class AvailableClient implements Cloneable {
 		if (isInUseBy(expectedOwner)) {
 			LOGGER.info("Prematurely releasing client " + this);
 			this.inUseBy = null;
-			this.connection = null;
+		} else {
+			LOGGER.info("Could not release client " + this + ". Already in use by " + this.inUseBy);
 		}
 	}