Prevent double registration of event publisher registrar

tish · wilkinsona · commit 50c44e301a03 · 2024-01-30T15:59:05.000Z
See gh-39297
diff --git a/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/properties/TestcontainersPropertySource.java b/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/properties/TestcontainersPropertySource.java
@@ -115,7 +115,7 @@ private static DynamicPropertyRegistry attach(Environment environment, Applicati
 		if (eventPublisher != null) {
 			propertySource.addEventPublisher(eventPublisher);
 		}
-		else if (registry != null) {
+		else if (registry != null && !registry.containsBeanDefinition(EventPublisherRegistrar.NAME)) {
 			registry.registerBeanDefinition(EventPublisherRegistrar.NAME, new RootBeanDefinition(
 					EventPublisherRegistrar.class, () -> new EventPublisherRegistrar(environment)));
 		}

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ private static DynamicPropertyRegistry attach(Environment environment, Applicati`
`115`	`115`	`if (eventPublisher != null) {`
`116`	`116`	`propertySource.addEventPublisher(eventPublisher);`
`117`	`117`	`}`
`118`		`- else if (registry != null) {`
	`118`	`+ else if (registry != null && !registry.containsBeanDefinition(EventPublisherRegistrar.NAME)) {`
`119`	`119`	`registry.registerBeanDefinition(EventPublisherRegistrar.NAME, new RootBeanDefinition(`
`120`	`120`	`EventPublisherRegistrar.class, () -> new EventPublisherRegistrar(environment)));`
`121`	`121`	`}`