Skip to content

Commit 3ff9de8

Browse files
jansupolsenivam
authored andcommitted
Prevent race condition in JettyConnector
Signed-off-by: Jan Supol <[email protected]>
1 parent 03d8a72 commit 3ff9de8

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

connectors/jetty-connector/src/main/java/org/glassfish/jersey/jetty/connector/JettyConnector.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,9 @@ public void onContent(final Response jettyResponse, final ByteBuffer content) {
436436
@Override
437437
public void onComplete(final Result result) {
438438
entityStream.closeQueue();
439-
callback.response(jerseyResponse.get());
439+
if (!callbackInvoked.get()) {
440+
callback.response(jerseyResponse.get());
441+
}
440442
responseFuture.complete(jerseyResponse.get());
441443
}
442444

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2155,7 +2155,7 @@
21552155
<jaxrs.api.spec.version>2.1</jaxrs.api.spec.version>
21562156
<jaxrs.api.impl.version>2.1.6</jaxrs.api.impl.version>
21572157
<jetty.plugin.version>6.1.26</jetty.plugin.version>
2158-
<jetty.version>9.4.27.v20200227</jetty.version>
2158+
<jetty.version>9.4.28.v20200408</jetty.version>
21592159
<jetty.servlet.api.25.version>6.1.14</jetty.servlet.api.25.version>
21602160
<jsonb.api.version>1.0.2</jsonb.api.version>
21612161
<jsonp.ri.version>1.1.6</jsonp.ri.version>

0 commit comments

Comments
 (0)