From d33c2b52ccad18ff2335c8511edd431eb2077330 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 27 Jul 2022 15:17:02 +0100 Subject: [PATCH] Don't look for RuntimeHintsRegistrar beans Update `RuntimeHintsBeanFactoryInitializationAotProcessor` so that `RuntimeHintsRegistrar` beans are not loaded. See gh-28866 --- .../aot/RuntimeHintsBeanFactoryInitializationAotProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-context/src/main/java/org/springframework/context/aot/RuntimeHintsBeanFactoryInitializationAotProcessor.java b/spring-context/src/main/java/org/springframework/context/aot/RuntimeHintsBeanFactoryInitializationAotProcessor.java index c83224f4b4..b429e12ebb 100644 --- a/spring-context/src/main/java/org/springframework/context/aot/RuntimeHintsBeanFactoryInitializationAotProcessor.java +++ b/spring-context/src/main/java/org/springframework/context/aot/RuntimeHintsBeanFactoryInitializationAotProcessor.java @@ -57,7 +57,7 @@ class RuntimeHintsBeanFactoryInitializationAotProcessor public BeanFactoryInitializationAotContribution processAheadOfTime( ConfigurableListableBeanFactory beanFactory) { Map, RuntimeHintsRegistrar> registrars = AotServices - .factoriesAndBeans(beanFactory).load(RuntimeHintsRegistrar.class).stream() + .factories(beanFactory.getBeanClassLoader()).load(RuntimeHintsRegistrar.class).stream() .collect(LinkedHashMap::new, (map, item) -> map.put(item.getClass(), item), Map::putAll); extractFromBeanFactory(beanFactory).forEach(registrarClass -> registrars.computeIfAbsent(registrarClass, BeanUtils::instantiateClass));