Skip to content

Commit

Permalink
Merge branch '6.1.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
rstoyanchev committed May 15, 2024
2 parents edb6bb7 + 010e8a3 commit da3b59e
Showing 1 changed file with 7 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -37,6 +37,7 @@
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.util.Assert;
import org.springframework.util.MultiValueMap;

/**
* {@link ClientHttpRequest} for the Java {@link HttpClient}.
Expand Down Expand Up @@ -108,7 +109,11 @@ protected void applyHeaders() {

@Override
protected void applyCookies() {
this.builder.header(HttpHeaders.COOKIE, getCookies().values().stream()
MultiValueMap<String, HttpCookie> cookies = getCookies();
if (cookies.isEmpty()) {
return;
}
this.builder.header(HttpHeaders.COOKIE, cookies.values().stream()
.flatMap(List::stream).map(HttpCookie::toString).collect(Collectors.joining(";")));
}

Expand Down

0 comments on commit da3b59e

Please sign in to comment.