spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-17 16:39:29 +00:00
Code Issues Projects Releases Wiki Activity

ServletResponseHeadersAdapter checks contentType property

Browse Source 
Issue gh-36334
This commit is contained in:
rstoyanchev
2026-02-17 11:55:34 +00:00
parent 8bf85d2596
commit e5aac66157
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-web/src/main/java/org/springframework/http/server/ServletResponseHeadersAdapter.java
+13 -4
View File
@@ -19,6 +19,7 @@ package org.springframework.http.server;
import java.util.AbstractSet;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
@@ -49,8 +50,12 @@ class ServletResponseHeadersAdapter implements MultiValueMap<String, String> {
@Override
public String getFirst(String key) {
return this.response.getHeader(key);
public @Nullable String getFirst(String key) {
String header = this.response.getHeader(key);
if (header == null && key.equalsIgnoreCase(HttpHeaders.CONTENT_TYPE)) {
header = this.response.getContentType();
}
return header;
}
@Override
@@ -119,6 +124,10 @@ class ServletResponseHeadersAdapter implements MultiValueMap<String, String> {
public @Nullable List<String> get(Object key) {
if (key instanceof String headerName) {
Collection<String> values = this.response.getHeaders(headerName);
if (values.isEmpty() && headerName.equalsIgnoreCase(HttpHeaders.CONTENT_TYPE)) {
String contentType = this.response.getContentType();
return (contentType != null ? Collections.singletonList(contentType) : null);
}
if (!values.isEmpty()) {
return new ArrayList<>(values);
}
@@ -138,11 +147,11 @@ class ServletResponseHeadersAdapter implements MultiValueMap<String, String> {
@Override
public @Nullable List<String> remove(Object key) {
if (key instanceof String headerName) {
Collection<String> previous = this.response.getHeaders(headerName);
List<String> previous = get(headerName);
if (previous != null) {
this.response.setHeader(headerName, null);
}
return (previous != null ? new ArrayList<>(previous) : null);
return previous;
}
return null;
}