X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Ffcp%2Fquelaton%2FClientHelloImpl.java;h=4e3b51c8dee54c61ffcd3fd0948df81395ccd01f;hb=fc1c3f3719425dfafb42fedef9ecad05783dd32c;hp=9c03291c170b7cd68cafba96f7afcfb215ae0163;hpb=4db57d2ff54b90a07f3659e31bad206d07576136;p=jFCPlib.git

diff --git a/src/main/java/net/pterodactylus/fcp/quelaton/ClientHelloImpl.java b/src/main/java/net/pterodactylus/fcp/quelaton/ClientHelloImpl.java
index 9c03291..4e3b51c 100644
--- a/src/main/java/net/pterodactylus/fcp/quelaton/ClientHelloImpl.java
+++ b/src/main/java/net/pterodactylus/fcp/quelaton/ClientHelloImpl.java
@@ -39,15 +39,14 @@ public class ClientHelloImpl {
 	}
 
 	private ListenableFuture<FcpConnection> execute() {
-		return threadPool.submit(() -> establishConnection());
+		return threadPool.submit(this::establishConnection);
 	}
 
 	private FcpConnection establishConnection() throws IOException {
 		FcpConnection connection = new FcpConnection(hostname, port);
 		connection.connect();
-		ClientHelloReplySequence nodeHelloSequence = new ClientHelloReplySequence(connection);
 		ClientHello clientHello = new ClientHello(clientName.get(), "2.0");
-		try {
+		try (ClientHelloReplySequence nodeHelloSequence = new ClientHelloReplySequence(connection)) {
 			if (nodeHelloSequence.send(clientHello).get()) {
 				return connection;
 			}
@@ -62,7 +61,6 @@ public class ClientHelloImpl {
 	private class ClientHelloReplySequence extends FcpReplySequence<Boolean> {
 
 		private final AtomicReference<NodeHello> receivedNodeHello = new AtomicReference<>();
-		private final AtomicBoolean receivedClosed = new AtomicBoolean();
 
 		public ClientHelloReplySequence(FcpConnection connection) {
 			super(ClientHelloImpl.this.threadPool, connection);
@@ -70,7 +68,7 @@ public class ClientHelloImpl {
 
 		@Override
 		protected boolean isFinished() {
-			return receivedNodeHello.get() != null || receivedClosed.get();
+			return receivedNodeHello.get() != null;
 		}
 
 		@Override
@@ -83,12 +81,6 @@ public class ClientHelloImpl {
 			receivedNodeHello.set(nodeHello);
 		}
 
-		@Override
-		protected void consumeCloseConnectionDuplicateClientName(
-			CloseConnectionDuplicateClientName closeConnectionDuplicateClientName) {
-			receivedClosed.set(true);
-		}
-
 	}
 
 }