root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #31928 from izeye 

* pr/31928:
  Polish DataSourceBuilder.derivedFrom()

Closes gh-31928
This commit is contained in:
Phillip Webb 2022-08-01 08:49:38 +01:00
parent bdebdb5cc2 c9c435cdae
commit a21b5f5bee
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DataSourceBuilder.java
View File

@ -238,18 +238,6 @@ public final class DataSourceBuilder<T extends DataSource> {
throw new IllegalStateException("Unable to unwrap embedded database", ex);
}
}
try {
while (dataSource.isWrapperFor(DataSource.class)) {
DataSource unwrapped = dataSource.unwrap(DataSource.class);
if (unwrapped == dataSource) {
break;
}
dataSource = unwrapped;
}
}
catch (SQLException ex) {
// Try to continue with the existing, potentially still wrapped, DataSource
}
return new DataSourceBuilder<>(unwrap(dataSource));
}