Skip to content

Commit f278dde

Browse files
authored
Merge pull request #34789 from bcluap/main
Avoid race condition on adding content-length header
2 parents df74f86 + 890a36a commit f278dde

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/ResteasyReactiveOutputStream.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -226,10 +226,12 @@ private void prepareWrite(ByteBuf buffer, boolean finished) throws IOException {
226226
if (!committed) {
227227
committed = true;
228228
if (finished) {
229-
if (buffer == null) {
230-
context.serverResponse().setResponseHeader(HttpHeaderNames.CONTENT_LENGTH, "0");
231-
} else {
232-
context.serverResponse().setResponseHeader(HttpHeaderNames.CONTENT_LENGTH, "" + buffer.readableBytes());
229+
if (!context.serverResponse().headWritten()) {
230+
if (buffer == null) {
231+
context.serverResponse().setResponseHeader(HttpHeaderNames.CONTENT_LENGTH, "0");
232+
} else {
233+
context.serverResponse().setResponseHeader(HttpHeaderNames.CONTENT_LENGTH, "" + buffer.readableBytes());
234+
}
233235
}
234236
} else {
235237
var contentLengthSet = contentLengthSet();

0 commit comments

Comments
 (0)