[felix-dev] branch master updated: FELIX-6487 : Update to Jetty 11 - Only set cookie domain if not null

[cziegeler]

This is an automated email from the ASF dual-hosted git repository.

cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git


The following commit(s) were added to refs/heads/master by this push:
     new 3914c4e  FELIX-6487 : Update to Jetty 11 - Only set cookie domain if 
not null
3914c4e is described below

commit 3914c4e9ec75dc61e6a8f1672d30f7db35ca9391
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Wed Mar 16 11:42:34 2022 +0100

    FELIX-6487 : Update to Jetty 11 - Only set cookie domain if not null
---
 .../felix/http/base/internal/jakartawrappers/CookieWrapper.java       | 4 +++-
 .../apache/felix/http/base/internal/javaxwrappers/CookieWrapper.java  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git 
a/http/base/src/main/java/org/apache/felix/http/base/internal/jakartawrappers/CookieWrapper.java
 
b/http/base/src/main/java/org/apache/felix/http/base/internal/jakartawrappers/CookieWrapper.java
index d4be990..e040659 100644
--- 
a/http/base/src/main/java/org/apache/felix/http/base/internal/jakartawrappers/CookieWrapper.java
+++ 
b/http/base/src/main/java/org/apache/felix/http/base/internal/jakartawrappers/CookieWrapper.java
@@ -53,7 +53,9 @@ public class CookieWrapper extends Cookie {
         super(c.getName(), c.getValue());
         this.cookie = c;
         super.setComment(c.getComment());
-        super.setDomain(c.getDomain());
+        if ( c.getDomain() != null ) {
+            super.setDomain(c.getDomain());
+        }
         super.setHttpOnly(c.isHttpOnly());
         super.setMaxAge(c.getMaxAge());
         super.setPath(c.getPath());
diff --git 
a/http/base/src/main/java/org/apache/felix/http/base/internal/javaxwrappers/CookieWrapper.java
 
b/http/base/src/main/java/org/apache/felix/http/base/internal/javaxwrappers/CookieWrapper.java
index 38db88d..85d42b4 100644
--- 
a/http/base/src/main/java/org/apache/felix/http/base/internal/javaxwrappers/CookieWrapper.java
+++ 
b/http/base/src/main/java/org/apache/felix/http/base/internal/javaxwrappers/CookieWrapper.java
@@ -53,7 +53,9 @@ public class CookieWrapper extends javax.servlet.http.Cookie {
         super(c.getName(), c.getValue());
         this.cookie = c;
         super.setComment(c.getComment());
-        super.setDomain(c.getDomain());
+        if ( c.getDomain() != null ) {
+            super.setDomain(c.getDomain());
+        }
         super.setHttpOnly(c.isHttpOnly());
         super.setMaxAge(c.getMaxAge());
         super.setPath(c.getPath());