From a7fe6b8f5c74dd6ea0e531b3ba1e90a455ee15dd Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@pivotal.io>
Date: Thu, 19 Mar 2020 12:18:29 +0000
Subject: [PATCH] Avoid NPE in ResponseCookie on null domain

See gh-24663
---
 .../src/main/java/org/springframework/http/ResponseCookie.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-web/src/main/java/org/springframework/http/ResponseCookie.java b/spring-web/src/main/java/org/springframework/http/ResponseCookie.java
index 484d65b4806..3b8461bf3cd 100644
--- a/spring-web/src/main/java/org/springframework/http/ResponseCookie.java
+++ b/spring-web/src/main/java/org/springframework/http/ResponseCookie.java
@@ -245,7 +245,7 @@ public final class ResponseCookie extends HttpCookie {
 
 			@Nullable
 			private String initDomain(String domain) {
-				if (lenient) {
+				if (lenient && !StringUtils.isEmpty(domain)) {
 					String s = domain.trim();
 					if (s.startsWith("\"") && s.endsWith("\"")) {
 						if (s.substring(1, domain.length() - 1).trim().isEmpty()) {