Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes delivery of events to `Response.CompleteListener`s. (#10102) 

In case of `request.onComplete(Response.CompleteListener l)`, only the complete event should be delivered to `l`, not all the events (in case `l` implements other listener interfaces).

Only `Response.CompleteListener` passed to `request.send(Response.CompleteListener)` should receive all events.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
This commit is contained in:
Simone Bordet 2023-07-13 15:12:47 +02:00 committed by GitHub
parent a08e953c74
commit 190af2972b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpConnection.java
View File

@ -81,7 +81,7 @@ public abstract class HttpConnection implements IConnection, Attachable
httpRequest.sent();
if (listener != null)
responseListeners.addCompleteListener(listener);
responseListeners.addCompleteListener(listener, true);
HttpExchange exchange = new HttpExchange(getHttpDestination(), httpRequest);

4
jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpRequest.java
View File

@ -549,7 +549,7 @@ public class HttpRequest implements Request
@Override
public Request onComplete(Response.CompleteListener listener)
{
responseListeners.addCompleteListener(listener);
responseListeners.addCompleteListener(listener, false);
return this;
}
@ -674,7 +674,7 @@ public class HttpRequest implements Request
void sendAsync(HttpDestination destination, Response.CompleteListener listener)
{
if (listener != null)
responseListeners.addCompleteListener(listener);
responseListeners.addCompleteListener(listener, true);
destination.send(this);
}

7
jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/ResponseListeners.java
View File

@ -308,12 +308,7 @@ public class ResponseListeners
}
}
public boolean addCompleteListener(Response.CompleteListener listener)
{
return addCompleteListener(listener, true);
}
private boolean addCompleteListener(Response.CompleteListener listener, boolean includeOtherEvents)
public boolean addCompleteListener(Response.CompleteListener listener, boolean includeOtherEvents)
{
if (listener == null)
return false;

9
jetty-core/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java
View File

@ -1013,7 +1013,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest
start(scenario, new EmptyServerHandler());
AtomicInteger counter = new AtomicInteger();
CountDownLatch latch = new CountDownLatch(1);
CountDownLatch latch = new CountDownLatch(2);
Response.Listener listener = new Response.Listener()
{
@Override
@ -1079,12 +1079,13 @@ public class HttpClientTest extends AbstractHttpClientServerTest
.onResponseContentAsync(listener)
.onResponseSuccess(listener)
.onResponseFailure(listener)
.onComplete(listener)
.send(listener);
assertTrue(latch.await(5, TimeUnit.SECONDS));
int expectedEventsTriggeredByOnResponseXXXListeners = 3;
int expectedEventsTriggeredByCompletionListener = 4;
int expected = expectedEventsTriggeredByOnResponseXXXListeners + expectedEventsTriggeredByCompletionListener;
int expectedEventsTriggeredByResponseListeners = 4;
int expectedEventsTriggeredBySendListener = 4;
int expected = expectedEventsTriggeredByResponseListeners + expectedEventsTriggeredBySendListener;
assertEquals(expected, counter.get());
}

2
jetty-core/jetty-http2/jetty-http2-client-transport/src/main/java/org/eclipse/jetty/http2/client/transport/internal/HttpReceiverOverHTTP2.java
View File

@ -186,7 +186,7 @@ public class HttpReceiverOverHTTP2 extends HttpReceiver implements HTTP2Channel.
if (listener != null)
{
HttpChannelOverHTTP2 pushChannel = getHttpChannel().getHttpConnection().acquireHttpChannel();
pushRequest.getResponseListeners().addCompleteListener(listener);
pushRequest.getResponseListeners().addCompleteListener(listener, true);
HttpExchange pushExchange = new HttpExchange(getHttpDestination(), pushRequest);
pushChannel.associate(pushExchange);
pushChannel.setStream(stream);