re-introduce static SENTINEL_ERROR_CONTENT with an exception that doe…

…s not record suppressed exceptions Signed-off-by: Ludovic Orban <lorban@bitronix.be>
jetty · Jun 9, 2022 · ac2c862 · ac2c862
1 parent 7a26b4e
commit ac2c862
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 23 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
@@ -31,7 +31,7 @@
 class AsyncContentProducer implements ContentProducer
 {
     private static final Logger LOG = LoggerFactory.getLogger(AsyncContentProducer.class);
-    private static final HttpInput.Content EOF = new HttpInput.EofContent();
+    private static final HttpInput.ErrorContent SENTINEL_ERROR_CONTENT = new HttpInput.ErrorContent(new UnconsumedContentException());
 
     private final AutoLock _lock = new AutoLock();
     private final HttpChannel _httpChannel;
@@ -63,12 +63,12 @@ public void recycle()
         // Make sure that the content has been fully consumed before destroying the interceptor and also make sure
         // that asking this instance for content between recycle and reopen will only produce EOF content.
         if (_rawContent == null)
-            _rawContent = EOF;
+            _rawContent = SENTINEL_ERROR_CONTENT;
         else if (!_rawContent.isSpecial())
             throw new IllegalStateException("ContentProducer with unconsumed content cannot be recycled");
 
         if (_transformedContent == null)
-            _transformedContent = EOF;
+            _transformedContent = SENTINEL_ERROR_CONTENT;
         else if (!_transformedContent.isSpecial())
             throw new IllegalStateException("ContentProducer with unconsumed content cannot be recycled");
 
@@ -226,13 +226,9 @@ private void failCurrentContent(Throwable x)
             _rawContent = null;
         }
 
-        HttpInput.Content finalContent;
-        if (x != null)
-            finalContent = new HttpInput.ErrorContent(x);
-        else
-            finalContent = null;
-        _transformedContent = finalContent;
-        _rawContent = finalContent;
+        HttpInput.ErrorContent errorContent = x == null ? SENTINEL_ERROR_CONTENT : new HttpInput.ErrorContent(x);
+        _transformedContent = errorContent;
+        _rawContent = errorContent;
     }
 
     @Override

diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/ContentProducer.java b/jetty-server/src/main/java/org/eclipse/jetty/server/ContentProducer.java
@@ -13,8 +13,6 @@
 
 package org.eclipse.jetty.server;
 
-import java.io.IOException;
-
 import org.eclipse.jetty.util.component.Destroyable;
 import org.eclipse.jetty.util.thread.AutoLock;
 import org.slf4j.Logger;
@@ -155,23 +153,15 @@ public interface ContentProducer
 
     /**
      * This exception used to report when there is some unconsumed content left at the end of a request's processing.
+     * Suppressed exceptions are disabled, meaning calling {@link #addSuppressed(Throwable)} has no effect.
      */
-    class UnconsumedContentException extends IOException
+    class UnconsumedContentException extends Exception
     {
         private static final Logger LOG = LoggerFactory.getLogger(UnconsumedContentException.class);
 
         public UnconsumedContentException()
         {
-            super("Unconsumed content");
-        }
-
-        @Override
-        public Throwable fillInStackTrace()
-        {
-            if (LOG.isDebugEnabled())
-                return super.fillInStackTrace();
-            else
-                return this;
+            super("Unconsumed content", null, false, LOG.isDebugEnabled());
         }
     }
 }