Merge pull request #192 from basil/jakarta-nested-exception

Allow for deeply nested causes
jenkinsci · May 23, 2024 · 4bcc83e · 4bcc83e
2 parents 15c9e3f + 46a28cc
commit 4bcc83e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/io/jenkins/plugins/file_parameters/AbstractFileParameterDefinition.java b/src/main/java/io/jenkins/plugins/file_parameters/AbstractFileParameterDefinition.java
@@ -24,6 +24,7 @@
 
 package io.jenkins.plugins.file_parameters;
 
+import com.google.common.base.Throwables;
 import hudson.cli.CLICommand;
 import hudson.model.Failure;
 import hudson.model.ParameterDefinition;
@@ -69,8 +70,7 @@ protected Object readResolve() {
                 src = req.getFileItem(getName());
             } catch (Exception x) {
                 // TODO simplify when we drop support for Commons FileUpload 1.x
-                String simpleName =
-                        x.getCause() != null ? x.getCause().getClass().getSimpleName() : null;
+                String simpleName = Throwables.getRootCause(x).getClass().getSimpleName();
                 if ("InvalidContentTypeException".equals(simpleName) /* Commons FileUpload 1.x */
                         || "FileUploadContentTypeException".equals(simpleName)) /* Commons FileUpload 2.x */ {
                     src = null;