Skip to content

Fixes NPE when a Response does not provide headers #855

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 11, 2018
Merged

Fixes NPE when a Response does not provide headers #855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion core/src/main/java/feign/Response.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.nio.charset.Charset;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.Locale;
import java.util.Map;
Expand Down Expand Up @@ -49,7 +50,9 @@ private Response(Builder builder) {
this.status = builder.status;
this.request = builder.request;
this.reason = builder.reason; // nullable
this.headers = Collections.unmodifiableMap(caseInsensitiveCopyOf(builder.headers));
this.headers = (builder.headers != null)
? Collections.unmodifiableMap(caseInsensitiveCopyOf(builder.headers))
: new LinkedHashMap<>();
this.body = builder.body; // nullable
}

Expand Down
10 changes: 10 additions & 0 deletions core/src/test/java/feign/ResponseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,14 @@ public void headerValuesWithSameNameOnlyVaryingInCaseAreMerged() {
Arrays.asList("Cookie-A=Value", "Cookie-B=Value", "Cookie-C=Value");
assertThat(response.headers()).containsOnly(entry(("set-cookie"), expectedHeaderValue));
}

@Test
public void headersAreOptional() {
Response response = Response.builder()
.status(200)
.request(Request.create(HttpMethod.GET, "/api", Collections.emptyMap(), null, Util.UTF_8))
.body(new byte[0])
.build();
assertThat(response.headers()).isNotNull().isEmpty();
}
}