From f57c8f52bf5485aa0690bfe09066ac4b6cce8b7b Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Thu, 5 Dec 2013 08:54:13 +0000 Subject: [PATCH] Check for null before trying to use ApplicationContext Fixes gh-145 --- .../AutoConfigurationReportLoggingInitializer.java | 4 ++++ .../AutoConfigurationReportLoggingInitializerTests.java | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationReportLoggingInitializer.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationReportLoggingInitializer.java index e9a3efa4ea4..2e6f5fe6da0 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationReportLoggingInitializer.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationReportLoggingInitializer.java @@ -87,6 +87,10 @@ public class AutoConfigurationReportLoggingInitializer implements public void logAutoConfigurationReport(boolean isCrashReport) { if (this.report == null) { + if (this.applicationContext == null) { + this.logger.info("Nothing to report: ApplicationContext not available"); + return; + } this.report = AutoConfigurationReport.get(this.applicationContext .getBeanFactory()); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationReportLoggingInitializerTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationReportLoggingInitializerTests.java index 8d599b87142..de6063e6caa 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationReportLoggingInitializerTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationReportLoggingInitializerTests.java @@ -162,6 +162,13 @@ public class AutoConfigurationReportLoggingInitializerTests { assertNotNull(context.getBean(AutoConfigurationReport.class)); } + @Test + public void noErrorIfNotInitialized() throws Exception { + this.initializer.handleError(null, null, new String[0], new RuntimeException( + "Planned")); + assertThat(this.infoLog.get(0), containsString("Nothing to report")); + } + public static class MockLogFactory extends LogFactoryImpl { @Override public Log getInstance(String name) throws LogConfigurationException {