Issue #4825 Changes after review

Signed-off-by: Jan Bartel <janb@webtide.com>
jetty · Apr 29, 2020 · 087d91b · 087d91b
1 parent 3fd7183
commit 087d91b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 17 deletions.
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/PushBuilderImpl.java b/jetty-server/src/main/java/org/eclipse/jetty/server/PushBuilderImpl.java
@@ -41,7 +41,7 @@ public class PushBuilderImpl implements PushBuilder
 {
     private static final Logger LOG = LoggerFactory.getLogger(PushBuilderImpl.class);
 
-    private static final HttpField JettyPush = new HttpField("x-http2-push", "PushBuilder");
+    private static final HttpField JETTY_PUSH = new HttpField("x-http2-push", "PushBuilder");
     private static EnumSet<HttpMethod> UNSAFE_METHODS = EnumSet.of(
         HttpMethod.POST,
         HttpMethod.PUT,
@@ -66,7 +66,7 @@ public PushBuilderImpl(Request request, HttpFields fields, String method, String
         _method = method;
         _queryString = queryString;
         _sessionId = sessionId;
-        _fields.add(JettyPush);
+        _fields.add(JETTY_PUSH);
         if (LOG.isDebugEnabled())
             LOG.debug("PushBuilder({} {}?{} s={} c={})", _method, _request.getRequestURI(), _queryString, _sessionId);
     }

diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
@@ -432,24 +432,16 @@ public PushBuilder newPushBuilder()
         for (HttpField field : responseFields)
         {
             HttpHeader header = field.getHeader();
-            if (header == null)
-                continue;
-            switch (header)
+            if (header == HttpHeader.SET_COOKIE)
             {
-                case SET_COOKIE:
-                {
-                    HttpCookie cookie = ((SetCookieHttpField)field).getHttpCookie();
-                    if (cookie.getMaxAge() > 0)
-                        cookies.put(cookie.getName(), cookie.getValue());
-                    else
-                        cookies.remove(cookie.getName());
-                    continue;
-                }
-                default:
-                    continue;
+                HttpCookie cookie = ((SetCookieHttpField)field).getHttpCookie();
+                if (cookie.getMaxAge() > 0)
+                    cookies.put(cookie.getName(), cookie.getValue());
+                else
+                    cookies.remove(cookie.getName());
             }
         }
-        
+
         if (!cookies.isEmpty())
         {
             StringBuilder buff = new StringBuilder();