Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.2.x'

Browse Source 
Closes gh-41077
This commit is contained in:
Phillip Webb
2024-06-11 10:48:52 -07:00
parent 3912d6ccac 9ddb7b0238
commit 255bcc28e6
9 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigData.java
View File

@@ -239,8 +239,7 @@ public final class ConfigData {
}
private Options copy(Consumer<EnumSet<Option>> processor) {
EnumSet<Option> options = EnumSet.noneOf(Option.class);
options.addAll(this.options);
EnumSet<Option> options = EnumSet.copyOf(this.options);
processor.accept(options);
return new Options(options);
}

5
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TldPatterns.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -195,8 +195,7 @@ final class TldPatterns {
static final Set<String> DEFAULT_SCAN;
static {
Set<String> scanPatterns = new LinkedHashSet<>();
scanPatterns.addAll(TOMCAT_SCAN);
Set<String> scanPatterns = new LinkedHashSet<>(TOMCAT_SCAN);
DEFAULT_SCAN = Collections.unmodifiableSet(scanPatterns);
}

5
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatEmbeddedContext.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2022 the original author or authors.
* Copyright 2012-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -128,8 +128,7 @@ class TomcatEmbeddedContext extends StandardContext {
@Override
public String[] findMimeMappings() {
List<String> mappings = new ArrayList<>();
mappings.addAll(Arrays.asList(super.findMimeMappings()));
List<String> mappings = new ArrayList<>(Arrays.asList(super.findMimeMappings()));
if (this.mimeMappings != null) {
this.mimeMappings.forEach((mapping) -> mappings.add(mapping.getExtension()));
}