[FIXED JENKINS-29934] Prevent UnsupportedOperationException with empt…

…y choice
jenkinsci · Aug 13, 2015 · 667c207 · 667c207
1 parent c798ede
commit 667c207
Showing 1 changed file with 3 additions and 12 deletions.
diff --git a/...ava/jp/ikedam/jenkins/plugins/extensible_choice_parameter/FilenameChoiceListProvider.java b/...ava/jp/ikedam/jenkins/plugins/extensible_choice_parameter/FilenameChoiceListProvider.java
@@ -295,29 +295,20 @@ protected static List<String> getFileList(
             }
         case Directory:
             {
-                ret = Arrays.asList(ds.getIncludedDirectories());
+                ret = new ArrayList<String>(Arrays.asList(ds.getIncludedDirectories()));
                 break;
             }
         default:
             {
                 // case File:
-                ret = Arrays.asList(ds.getIncludedFiles());
+                ret = new ArrayList<String>(Arrays.asList(ds.getIncludedFiles()));
                 break;
             }
         }
 
         if(reverseOrder)
         {
-            try
-            {
-                Collections.reverse(ret);
-            }
-            catch(UnsupportedOperationException _)
-            {
-                // ret is immutable.
-                ret = new ArrayList<String>(ret);
-                Collections.reverse(ret);
-            }
+            Collections.reverse(ret);
         }
 
         if(emptyChoiceType == null)