Issue #11281 - fix two NPEs seen during MultiPart with DEBUG enabled

jetty · Jan 24, 2024 · f68e4c9 · f68e4c9
1 parent 3853628
commit f68e4c9
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/MultiPart.java b/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/MultiPart.java
@@ -226,7 +226,10 @@ public Content.Source getContentSource()
 
         public long getLength()
         {
-            return getContentSource().getLength();
+            Content.Source source = getContentSource();
+            if (source != null)
+                return source.getLength();
+            return -1;
         }
 
         /**
@@ -320,7 +323,9 @@ public void fail(Throwable t)
         {
             try
             {
-                getContentSource().fail(t);
+                Content.Source source = getContentSource();
+                if (source != null)
+                    source.fail(t);
                 Path path = null;
                 try (AutoLock ignored = lock.lock())
                 {