projects
/
jFCPlib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename Keyed interface to WithUri
[jFCPlib.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
fcp
/
quelaton
/
FcpReplySequence.java
diff --git
a/src/main/java/net/pterodactylus/fcp/quelaton/FcpReplySequence.java
b/src/main/java/net/pterodactylus/fcp/quelaton/FcpReplySequence.java
index
9b2db2a
..
106bd8a
100644
(file)
--- a/
src/main/java/net/pterodactylus/fcp/quelaton/FcpReplySequence.java
+++ b/
src/main/java/net/pterodactylus/fcp/quelaton/FcpReplySequence.java
@@
-1,6
+1,8
@@
package net.pterodactylus.fcp.quelaton;
import java.io.IOException;
package net.pterodactylus.fcp.quelaton;
import java.io.IOException;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.ExecutorService;
import java.util.function.Consumer;
import java.util.concurrent.ExecutorService;
import java.util.function.Consumer;
@@
-59,6
+61,7
@@
public abstract class FcpReplySequence<R> implements AutoCloseable, FcpListener
private final Object syncObject = new Object();
private final ListeningExecutorService executorService;
private final FcpConnection fcpConnection;
private final Object syncObject = new Object();
private final ListeningExecutorService executorService;
private final FcpConnection fcpConnection;
+ private final Queue<FcpMessage> messages = new ConcurrentLinkedQueue<>();
public FcpReplySequence(ExecutorService executorService, FcpConnection fcpConnection) {
this.executorService = MoreExecutors.listeningDecorator(executorService);
public FcpReplySequence(ExecutorService executorService, FcpConnection fcpConnection) {
this.executorService = MoreExecutors.listeningDecorator(executorService);
@@
-69,10
+72,17
@@
public abstract class FcpReplySequence<R> implements AutoCloseable, FcpListener
public ListenableFuture<R> send(FcpMessage fcpMessage) throws IOException {
fcpConnection.addFcpListener(this);
public ListenableFuture<R> send(FcpMessage fcpMessage) throws IOException {
fcpConnection.addFcpListener(this);
-
fcpConnection.sendMessage
(fcpMessage);
+
messages.add
(fcpMessage);
return executorService.submit(() -> {
synchronized (syncObject) {
return executorService.submit(() -> {
synchronized (syncObject) {
- while (!isFinished()) {
+ while (!isFinished() || !messages.isEmpty()) {
+ while (messages.peek() != null) {
+ FcpMessage message = messages.poll();
+ fcpConnection.sendMessage(message);
+ }
+ if (isFinished()) {
+ continue;
+ }
syncObject.wait();
}
}
syncObject.wait();
}
}
@@
-80,6
+90,17
@@
public abstract class FcpReplySequence<R> implements AutoCloseable, FcpListener
});
}
});
}
+ protected void sendMessage(FcpMessage fcpMessage) {
+ messages.add(fcpMessage);
+ notifySyncObject();
+ }
+
+ private void notifySyncObject() {
+ synchronized (syncObject) {
+ syncObject.notifyAll();
+ }
+ }
+
protected R getResult() {
return null;
}
protected R getResult() {
return null;
}
@@
-91,23
+112,17
@@
public abstract class FcpReplySequence<R> implements AutoCloseable, FcpListener
private <M> void consume(Consumer<M> consumer, M message) {
consumer.accept(message);
private <M> void consume(Consumer<M> consumer, M message) {
consumer.accept(message);
- synchronized (syncObject) {
- syncObject.notifyAll();
- }
+ notifySyncObject();
}
private void consumeUnknown(FcpMessage fcpMessage) {
consumeUnknownMessage(fcpMessage);
}
private void consumeUnknown(FcpMessage fcpMessage) {
consumeUnknownMessage(fcpMessage);
- synchronized (syncObject) {
- syncObject.notifyAll();
- }
+ notifySyncObject();
}
private void consumeClose(Throwable throwable) {
consumeConnectionClosed(throwable);
}
private void consumeClose(Throwable throwable) {
consumeConnectionClosed(throwable);
- synchronized (syncObject) {
- syncObject.notifyAll();
- }
+ notifySyncObject();
}
@Override
}
@Override