Merge pull request #7982 from eclipse/jetty-10.0.x-7977-WebSocketNPE

Issue #7977 - prevent possible NPE from UpgradeHttpServletRequest
jetty · May 16, 2022 · 5a62a77 · 5a62a77
2 parents 01363fc + a93896b
commit 5a62a77
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/...main/java/org/eclipse/jetty/websocket/core/server/internal/UpgradeHttpServletRequest.java b/...main/java/org/eclipse/jetty/websocket/core/server/internal/UpgradeHttpServletRequest.java
@@ -430,15 +430,17 @@ public void setAttribute(String name, Object value)
     {
         if (request == null)
             attributes.put(name, value);
-        request.setAttribute(name, value);
+        else
+            request.setAttribute(name, value);
     }
 
     @Override
     public void removeAttribute(String name)
     {
         if (request == null)
             attributes.remove(name);
-        request.removeAttribute(name);
+        else
+            request.removeAttribute(name);
     }
 
     @Override