Merge pull request #11700 from jetty/fix/12.0.x/npe-response-recycled

Issue #11699 - ISE when Response does not exist.
jetty · Apr 26, 2024 · 7da9056 · 7da9056
2 parents 429809e + 9163335
commit 7da9056
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/...-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletChannel.java b/...-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletChannel.java
@@ -279,7 +279,9 @@ public Request getRequest()
     public ServletContextResponse getServletContextResponse()
     {
         ServletContextRequest request = _servletContextRequest;
-        return request == null ? null : request.getServletContextResponse();
+        if (_servletContextRequest == null)
+            throw new IllegalStateException("Request/Response does not exist (likely recycled)");
+        return request.getServletContextResponse();
     }
 
     /**
@@ -291,6 +293,8 @@ public ServletContextResponse getServletContextResponse()
      */
     public Response getResponse()
     {
+        if (_response == null)
+            throw new IllegalStateException("Response does not exist (likely recycled)");
         return _response;
     }