diff --git a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletChannel.java b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletChannel.java index 34d1709b829d..40a20921cc39 100644 --- a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletChannel.java +++ b/jetty-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; }