Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

5049 fix pipe race condition #5050

Open
wants to merge 2 commits into
base: 4.x
Choose a base branch
from
Open

5049 fix pipe race condition #5050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3bb8d6c
#5049 fix Pipe's race condition
NilsRenaud Dec 22, 2023
f0cb637
Fix a broken test in PipeTest
NilsRenaud Dec 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/io/vertx/core/streams/impl/PipeImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ public void to(WriteStream<T> ws, Handler<AsyncResult<Void>> completionHandler)
ws.drainHandler(drainHandler);
}
});
src.resume();
result.future().onComplete(ar -> {
try {
src.handler(null);
Expand All @@ -109,6 +108,7 @@ public void to(WriteStream<T> ws, Handler<AsyncResult<Void>> completionHandler)
handleFailure(err, completionHandler);
}
});
src.resume();
}

private void handleSuccess(Handler<AsyncResult<Void>> completionHandler) {
Expand Down
20 changes: 17 additions & 3 deletions src/test/java/io/vertx/test/fakestream/FakeStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
public class FakeStream<T> implements ReadStream<T>, WriteStream<T> {

private static final Object END_SENTINEL = new Object();
private static final Object ERR_SENTINEL = new Object();

static class Op<T> {
final T item;
Expand Down Expand Up @@ -143,10 +144,21 @@ public void end(Handler<AsyncResult<Void>> h) {
}

public synchronized void fail(Throwable err) {
Handler<Throwable> handler = exceptionHandler;
if (handler != null) {
exceptionHandler.handle(err);
synchronized(this) {
if (ended) {
throw new IllegalStateException();
}
ended = true;
Promise<Void> promise = Promise.promise();
promise.future().onComplete(ar -> {
Handler<Throwable> handler = exceptionHandler;
if (handler != null) {
handler.handle(err);
}
});
pending.add(new Op<>((T)ERR_SENTINEL, promise));
}
checkPending();
}

@Override
Expand Down Expand Up @@ -178,6 +190,8 @@ private void checkPending() {
}
if (op.item == END_SENTINEL) {
end.onComplete(op.ack);
} else if(op.item == ERR_SENTINEL) {
op.ack.complete();
} else {
Handler<T> handler = itemHandler;
try {
Expand Down
Loading