(cxf) branch 4.1.x-fixes updated: [CXF-9111]ensure we have correct Content-Disposition set per spec

[ffang]

This is an automated email from the ASF dual-hosted git repository.

ffang pushed a commit to branch 4.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/4.1.x-fixes by this push:
     new ad4a84352d1 [CXF-9111]ensure we have correct Content-Disposition set 
per spec
ad4a84352d1 is described below

commit ad4a84352d10d30dcfcdb3702365cc2f8a6fa2a5
Author: Freeman Fang <freeman.f...@gmail.com>
AuthorDate: Fri Jan 9 17:25:38 2026 -0500

    [CXF-9111]ensure we have correct Content-Disposition set per spec
    
    (cherry picked from commit 2968735a216540871780e081103e9bb892a1fbb5)
---
 .../src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
index 9322a2cb677..b44aebb5e6f 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
@@ -357,7 +357,7 @@ public class MultipartProvider extends 
AbstractConfigurableProvider
                                      att.getObject().getClass(), new 
Annotation[]{},
                                      att.getContentType().toString(), id);
             MediaType mediaType = httpHeaders.getMediaType();
-            Attachment ret;
+            Attachment ret = null;
             if (MediaType.MULTIPART_FORM_DATA_TYPE.isCompatible(mediaType)
                 && att.getHeader("Content-Disposition") == null) {
                 ContentDisposition cd = new