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

Merge branch '3.4.x'

Browse Source 
Closes gh-44973
This commit is contained in:
Andy Wilkinson
2025-04-02 10:41:17 +01:00
parent c604eaeb56 7630c7c505
commit b8e4ec3dc4
12 changed files with 79 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/FileExtensionHint.java
View File

@@ -20,7 +20,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
* User provided hint for an otherwise missing file extension.
* User-provided hint for an otherwise missing file extension.
*
* @author Phillip Webb
*/

6
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/EmbeddedDatabaseConnection.java
View File

@@ -163,10 +163,8 @@ public enum EmbeddedDatabaseConnection {
* @return true if the data source is one of the embedded types
*/
public static boolean isEmbedded(DataSource dataSource) {
try {
try (Connection connection = dataSource.getConnection()) {
return new IsEmbedded().apply(connection);
}
try (Connection connection = dataSource.getConnection()) {
return new IsEmbedded().apply(connection);
}
catch (SQLException ex) {
// Could not connect, which means it's not embedded