projects
/
jFCPlib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add ListPeer command
[jFCPlib.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
fcp
/
quelaton
/
ClientHelloImpl.java
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
(file)
--- 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() {
}
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();
}
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");
ClientHello clientHello = new ClientHello(clientName.get(), "2.0");
- try {
+ try
(ClientHelloReplySequence nodeHelloSequence = new ClientHelloReplySequence(connection))
{
if (nodeHelloSequence.send(clientHello).get()) {
return 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 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);
public ClientHelloReplySequence(FcpConnection connection) {
super(ClientHelloImpl.this.threadPool, connection);
@@
-70,7
+68,7
@@
public class ClientHelloImpl {
@Override
protected boolean isFinished() {
@Override
protected boolean isFinished() {
- return receivedNodeHello.get() != null
|| receivedClosed.get()
;
+ return receivedNodeHello.get() != null;
}
@Override
}
@Override
@@
-83,12
+81,6
@@
public class ClientHelloImpl {
receivedNodeHello.set(nodeHello);
}
receivedNodeHello.set(nodeHello);
}
- @Override
- protected void consumeCloseConnectionDuplicateClientName(
- CloseConnectionDuplicateClientName closeConnectionDuplicateClientName) {
- receivedClosed.set(true);
- }
-
}
}
}
}