read factory from init parameters

Author: reiern70

java/org/apache/catalina/connector/Request.java

@@ -111,6 +111,7 @@
 import org.apache.tomcat.util.http.ServerCookies;
 import org.apache.tomcat.util.http.fileupload.FileItem;
 import org.apache.tomcat.util.http.fileupload.FileUpload;
+import org.apache.tomcat.util.http.fileupload.ProgressListenerFactory;
 import org.apache.tomcat.util.http.fileupload.disk.DiskFileItemFactory;
 import org.apache.tomcat.util.http.fileupload.impl.InvalidContentTypeException;
 import org.apache.tomcat.util.http.fileupload.impl.SizeException;
@@ -2491,7 +2492,10 @@ private void parseParts() {
         FileUpload upload = new FileUpload();
         // allow applications to register custom progress listeners
         if (servletContext instanceof ApplicationContextFacade applicationContext) {
-            upload.setProgressListener(applicationContext.getProgressListenerFactory().newProgressListener());
+            ProgressListenerFactory progressListenerFactory = applicationContext.getProgressListenerFactory();
+            if (progressListenerFactory != null) {
+                upload.setProgressListener(progressListenerFactory.newProgressListener(this.getRequest()));
+            }
         }
         upload.setFileItemFactory(factory);
         upload.setFileSizeMax(mce.getMaxFileSize());

java/org/apache/catalina/core/ApplicationContext.java

@@ -1184,7 +1184,7 @@ private ProgressListenerFactory newProgressListenerFactory() {
         String progressListenerFactoryClassName = getInitParameter(ProgressListenerFactory.FACTORY_NAME);
         if (progressListenerFactoryClassName == null || progressListenerFactoryClassName.isEmpty()) {
             log.warn(sm.getString("applicationContext.no.upload.progressListenerFactory", progressListenerFactoryClassName));
-            return ProgressListenerFactory.NULL_FACTORY;
+            return null;
         }
         try {
             Class<?> progressListenerFactoryClass = Introspection.loadClass(context, progressListenerFactoryClassName);
@@ -1193,7 +1193,7 @@ private ProgressListenerFactory newProgressListenerFactory() {
         } catch (InvocationTargetException | NoSuchMethodException | InstantiationException
                  | ClassCastException | IllegalAccessException e) {
             log.error(sm.getString("applicationContext.invalid.progressListenerFactory", progressListenerFactoryClassName), e);
-            return ProgressListenerFactory.NULL_FACTORY;
+            return null;
         }
     }
 

java/org/apache/tomcat/util/http/fileupload/ProgressListenerFactory.java

@@ -17,6 +17,8 @@
 
 package org.apache.tomcat.util.http.fileupload;
 
+import jakarta.servlet.http.HttpServletRequest;
+
 /**
  * Factory for {@link ProgressListener}. Users can specify this via a System property. See FACTORY_NAME
  */
@@ -27,20 +29,10 @@ public interface ProgressListenerFactory {
      */
     String FACTORY_NAME = "tomcat.fileUploadProgressListenerFactory";
 
-    /**
-     * Factory that creates no listeners. To avoid null checks in code.
-     */
-    ProgressListenerFactory NULL_FACTORY = new ProgressListenerFactory() {
-        @Override
-        public ProgressListener newProgressListener() {
-            return null;
-        }
-    };
-
 
     /**
      * @return returns a new {@link ProgressListener} for current request.
      */
-    ProgressListener newProgressListener();
+    ProgressListener newProgressListener(HttpServletRequest servletRequest);
 
 }