Skip LoadTimeWeaverAwareProcessor with native images

sdeleuze · sdeleuze · commit 05683fed7a3f · 2020-07-23T12:13:20.000+02:00
diff --git a/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java
@@ -726,7 +726,7 @@ protected void invokeBeanFactoryPostProcessors(ConfigurableListableBeanFactory b
 
 		// Detect a LoadTimeWeaver and prepare for weaving, if found in the meantime
 		// (e.g. through an @Bean method registered by ConfigurationClassPostProcessor)
-		if (beanFactory.getTempClassLoader() == null && beanFactory.containsBean(LOAD_TIME_WEAVER_BEAN_NAME)) {
+		if (!IN_NATIVE_IMAGE && beanFactory.getTempClassLoader() == null && beanFactory.containsBean(LOAD_TIME_WEAVER_BEAN_NAME)) {
 			beanFactory.addBeanPostProcessor(new LoadTimeWeaverAwareProcessor(beanFactory));
 			beanFactory.setTempClassLoader(new ContextTypeMatchClassLoader(beanFactory.getBeanClassLoader()));
 		}

Original file line number	Diff line number	Diff line change
`@@ -726,7 +726,7 @@ protected void invokeBeanFactoryPostProcessors(ConfigurableListableBeanFactory b`
`726`	`726`
`727`	`727`	`// Detect a LoadTimeWeaver and prepare for weaving, if found in the meantime`
`728`	`728`	`// (e.g. through an @Bean method registered by ConfigurationClassPostProcessor)`
`729`		`- if (beanFactory.getTempClassLoader() == null && beanFactory.containsBean(LOAD_TIME_WEAVER_BEAN_NAME)) {`
	`729`	`+ if (!IN_NATIVE_IMAGE && beanFactory.getTempClassLoader() == null && beanFactory.containsBean(LOAD_TIME_WEAVER_BEAN_NAME)) {`
`730`	`730`	`beanFactory.addBeanPostProcessor(new LoadTimeWeaverAwareProcessor(beanFactory));`
`731`	`731`	`beanFactory.setTempClassLoader(new ContextTypeMatchClassLoader(beanFactory.getBeanClassLoader()));`
`732`	`732`	`}`