Avoid UnsupportedOperationException with some JDKs

robertoschwald · web-flow · commit abe6d8699a17 · 2021-05-04T18:38:51.000+02:00
diff --git a/grails-core/src/main/groovy/org/grails/spring/context/support/PluginAwareResourceBundleMessageSource.java b/grails-core/src/main/groovy/org/grails/spring/context/support/PluginAwareResourceBundleMessageSource.java
@@ -152,7 +152,7 @@ public boolean accept(File dir, String name) {
                 basenames.add(baseName);
         }
 
-        List<String> mergedBasenames = Arrays.asList(basenamesDefinition);
+        List<String> mergedBasenames = new ArrayList<>(Arrays.asList(basenamesDefinition));
         basenames.removeAll(mergedBasenames);
         mergedBasenames.addAll(basenames);
         super.setBasenames(mergedBasenames.toArray(new String[0]));

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ public boolean accept(File dir, String name) {`
`152`	`152`	`basenames.add(baseName);`
`153`	`153`	`}`
`154`	`154`
`155`		`- List<String> mergedBasenames = Arrays.asList(basenamesDefinition);`
	`155`	`+ List<String> mergedBasenames = new ArrayList<>(Arrays.asList(basenamesDefinition));`
`156`	`156`	`basenames.removeAll(mergedBasenames);`
`157`	`157`	`mergedBasenames.addAll(basenames);`
`158`	`158`	`super.setBasenames(mergedBasenames.toArray(new String[0]));`