diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSource.java index ec33aba101..50b6d61667 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSource.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSource.java @@ -153,11 +153,11 @@ public abstract class AbstractRoutingDataSource extends AbstractDataSource imple * @throws IllegalArgumentException in case of an unsupported value type */ protected DataSource resolveSpecifiedDataSource(Object dataSource) throws IllegalArgumentException { - if (dataSource instanceof DataSource) { - return (DataSource) dataSource; + if (dataSource instanceof DataSource result) { + return result; } - else if (dataSource instanceof String) { - return this.dataSourceLookup.getDataSource((String) dataSource); + else if (dataSource instanceof String name) { + return this.dataSourceLookup.getDataSource(name); } else { throw new IllegalArgumentException(