root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge pull request #32793 from sdeleuze 

* pr/32793:
  Remove LogbackConfigurationAotContribution from native image

Closes gh-32793
This commit is contained in:
Phillip Webb 2022-10-19 23:50:43 -07:00
parent fb736e8427 3002779195
commit e8363d27a6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/SpringBootJoranConfigurator.java
View File

@ -56,6 +56,7 @@ import org.springframework.beans.factory.aot.BeanFactoryInitializationAotContrib
import org.springframework.beans.factory.aot.BeanFactoryInitializationCode; import org.springframework.beans.factory.aot.BeanFactoryInitializationCode;
import org.springframework.boot.logging.LoggingInitializationContext; import org.springframework.boot.logging.LoggingInitializationContext;
import org.springframework.core.CollectionFactory; import org.springframework.core.CollectionFactory;
import org.springframework.core.NativeDetector;
import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.ByteArrayResource;
import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
@ -110,7 +111,7 @@ class SpringBootJoranConfigurator extends JoranConfigurator {
@Override @Override
public void processModel(Model model) { public void processModel(Model model) {
super.processModel(model); super.processModel(model);
if (isAotProcessingInProgress()) { if (!NativeDetector.inNativeImage() && isAotProcessingInProgress()) {
getContext().putObject(BeanFactoryInitializationAotContribution.class.getName(), getContext().putObject(BeanFactoryInitializationAotContribution.class.getName(),
new LogbackConfigurationAotContribution(model, new LogbackConfigurationAotContribution(model,
getModelInterpretationContext().getBeanDescriptionCache(), getModelInterpretationContext().getBeanDescriptionCache(),