ErrorContent must not hold a null exception

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
jetty · Jun 7, 2022 · 79973da · 79973da
1 parent b199c71
commit 79973da
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/AsyncContentProducer.java b/jetty-server/src/main/java/org/eclipse/jetty/server/AsyncContentProducer.java
@@ -32,6 +32,7 @@ class AsyncContentProducer implements ContentProducer
 {
     private static final Logger LOG = LoggerFactory.getLogger(AsyncContentProducer.class);
     private static final HttpInput.ErrorContent RECYCLED_ERROR_CONTENT = new HttpInput.ErrorContent(new IllegalStateException("ContentProducer has been recycled"));
+    private static final HttpInput.ErrorContent FAILED_ERROR_CONTENT = new HttpInput.ErrorContent(new UnconsumedContentException());
 
     private final AutoLock _lock = new AutoLock();
     private final HttpChannel _httpChannel;
@@ -226,9 +227,13 @@ private void failCurrentContent(Throwable x)
             _rawContent = null;
         }
 
-        HttpInput.ErrorContent errorContent = new HttpInput.ErrorContent(x);
-        _transformedContent = errorContent;
-        _rawContent = errorContent;
+        HttpInput.Content finalContent;
+        if (x != null)
+            finalContent = new HttpInput.ErrorContent(x);
+        else
+            finalContent = FAILED_ERROR_CONTENT;
+        _transformedContent = finalContent;
+        _rawContent = finalContent;
     }
 
     @Override

diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
@@ -800,7 +800,7 @@ public static final class ErrorContent extends SpecialContent
 
         public ErrorContent(Throwable error)
         {
-            _error = error;
+            _error = Objects.requireNonNull(error);
         }
 
         @Override