Fix issue eclipse-ee4j#4773

Signed-off-by: tvallin <[email protected]>
tvallin · May 12, 2021 · b062901 · b062901
1 parent e129ced
commit b062901
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 9 deletions.
diff --git a/core-common/src/main/java/org/glassfish/jersey/message/internal/HeaderUtils.java b/core-common/src/main/java/org/glassfish/jersey/message/internal/HeaderUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -303,12 +303,12 @@ public static void checkHeaderChanges(final Map<String, String> headersSnapshot,
     /**
      * Compare two NewCookies having the same name. See documentation RFC.
      *
-     * @param first    NewCookie to be compared.
-     * @param second NewCookie to be compared.
+     * @param first     NewCookie to be compared.
+     * @param second    NewCookie to be compared.
      * @return the preferred NewCookie according to rules :
      *              - the latest maxAge.
-     *              - if equal, compare the expiry date
-     *              - if equal, compare name length
+     *              - if equal, compare the expiry date.
+     *              - if equal, compare path length.
      */
     public static NewCookie getPreferredCookie(NewCookie first, NewCookie second) {
 
@@ -318,13 +318,14 @@ public static NewCookie getPreferredCookie(NewCookie first, NewCookie second) {
             return first;
         }
 
-        if (first.getMaxAge() != second.getMaxAge()){
+        if (first.getMaxAge() != second.getMaxAge()) {
             return Comparator.comparing(NewCookie::getMaxAge).compare(first, second) > 0 ? first : second;
         } else if (first.getExpiry() != null && second.getExpiry() != null && !first.getExpiry().equals(second.getExpiry())) {
             return Comparator.comparing(NewCookie::getExpiry).compare(first, second) > 0 ? first : second;
-        } else {
+        } else if (first.getPath() != null && second.getPath() != null) {
             return first.getPath().length() > second.getPath().length() ? first : second;
         }
+        return first;
     }
 
     /**

diff --git a/...src/test/java/org/glassfish/jersey/tests/e2e/common/message/internal/HeaderUtilsTest.java b/...src/test/java/org/glassfish/jersey/tests/e2e/common/message/internal/HeaderUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -185,7 +185,7 @@ public void testAsHeaderString() throws Exception {
     }
 
     @Test
-    public void testgetPreferredCookie(){
+    public void testGetPreferredCookie(){
 
         Calendar calendar = Calendar.getInstance();
         calendar.set(2000, Calendar.JANUARY, 1);
@@ -227,4 +227,13 @@ public void testgetPreferredCookie(){
 
     }
 
+    @Test
+    public void testGetPreferredCookieWithNullPath() {
+        NewCookie first = new NewCookie("NAME", "VALUE");
+        NewCookie second = new NewCookie("NAME", "VALUE");
+        NewCookie returnedCookie = HeaderUtils.getPreferredCookie(first, second);
+
+        assertEquals(first, returnedCookie);
+    }
+
 }