root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch '6.0.x'

This commit is contained in:
Sam Brannen 2023-06-23 13:53:01 +02:00
parent da00bbebbf 3d33d2baa9
commit ca51b1422a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpResponse.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2022 the original author or authors. * Copyright 2002-2023 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -18,6 +18,7 @@ package org.springframework.http.server.reactive;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.List; import java.util.List;
import java.util.Objects;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelId; import io.netty.channel.ChannelId;
@ -37,7 +38,6 @@ import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatusCode; import org.springframework.http.HttpStatusCode;
import org.springframework.http.ResponseCookie; import org.springframework.http.ResponseCookie;
import org.springframework.http.ZeroCopyHttpOutputMessage; import org.springframework.http.ZeroCopyHttpOutputMessage;
import org.springframework.util.Assert;
/** /**
* Adapt {@link ServerHttpResponse} to the {@link HttpServerResponse}. * Adapt {@link ServerHttpResponse} to the {@link HttpServerResponse}.
@ -55,8 +55,8 @@ class ReactorServerHttpResponse extends AbstractServerHttpResponse implements Ze
public ReactorServerHttpResponse(HttpServerResponse response, DataBufferFactory bufferFactory) { public ReactorServerHttpResponse(HttpServerResponse response, DataBufferFactory bufferFactory) {
super(bufferFactory, new HttpHeaders(new NettyHeadersAdapter(response.responseHeaders()))); super(bufferFactory, new HttpHeaders(new NettyHeadersAdapter(Objects.requireNonNull(response,
Assert.notNull(response, "HttpServerResponse must not be null"); "HttpServerResponse must not be null").responseHeaders())));
this.response = response; this.response = response;
} }