Merge branch '3.3.x'

mhalbritter · mhalbritter · commit 61bab9223111 · 2024-12-11T14:25:44.000+01:00
Closes gh-43484
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/h2/H2ConsoleAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/h2/H2ConsoleAutoConfiguration.java
@@ -75,8 +75,8 @@ public ServletRegistrationBean<JakartaWebServlet> h2Console() {
 	}
 
 	@Bean
-	H2ConsoleLogger h2ConsoleLogger(ObjectProvider<DataSource> dataSource) {
-		return new H2ConsoleLogger(dataSource, this.properties.getPath());
+	H2ConsoleLogger h2ConsoleLogger(ObjectProvider<DataSource> dataSources) {
+		return new H2ConsoleLogger(dataSources, this.properties.getPath());
 	}
 
 	private void configureH2ConsoleSettings(ServletRegistrationBean<JakartaWebServlet> registration,

Original file line number	Diff line number	Diff line change
`@@ -75,8 +75,8 @@ public ServletRegistrationBean<JakartaWebServlet> h2Console() {`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`@Bean`
`78`		`- H2ConsoleLogger h2ConsoleLogger(ObjectProvider<DataSource> dataSource) {`
`79`		`- return new H2ConsoleLogger(dataSource, this.properties.getPath());`
	`78`	`+ H2ConsoleLogger h2ConsoleLogger(ObjectProvider<DataSource> dataSources) {`
	`79`	`+ return new H2ConsoleLogger(dataSources, this.properties.getPath());`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`private void configureH2ConsoleSettings(ServletRegistrationBean<JakartaWebServlet> registration,`