Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Logback 1.1.7

Browse Source 
Closes gh-5568
This commit is contained in:
Andy Wilkinson
2016-04-05 12:17:49 +01:00
parent dad4e84d35
commit ffe21175ca
2 changed files with 6 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/BackgroundPreinitializer.java
View File

@@ -20,11 +20,9 @@ import javax.validation.Validation;
import org.apache.catalina.mbeans.MBeanFactory;
import org.springframework.boot.context.event.ApplicationStartedEvent;
import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent;
import org.springframework.boot.logging.LoggingApplicationListener;
import org.springframework.context.ApplicationEvent;
import org.springframework.context.ApplicationListener;
import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.core.annotation.Order;
import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter;
@@ -37,21 +35,11 @@ import org.springframework.http.converter.support.AllEncompassingFormHttpMessage
* @since 1.3.0
*/
@Order(LoggingApplicationListener.DEFAULT_ORDER + 1)
public class BackgroundPreinitializer implements ApplicationListener<ApplicationEvent> {
private volatile Thread initializationThread;
public class BackgroundPreinitializer
implements ApplicationListener<ApplicationEnvironmentPreparedEvent> {
@Override
public void onApplicationEvent(ApplicationEvent event) {
if (event instanceof ApplicationStartedEvent) {
performInitialization();
}
else if (event instanceof ContextRefreshedEvent) {
awaitInitialization();
}
}
private void performInitialization() {
public void onApplicationEvent(ApplicationEnvironmentPreparedEvent event) {
try {
Thread thread = new Thread(new Runnable() {
@@ -73,7 +61,6 @@ public class BackgroundPreinitializer implements ApplicationListener<Application
}, "background-preinit");
thread.start();
this.initializationThread = thread;
}
catch (Exception ex) {
// This will fail on GAE where creating threads is prohibited. We can safely
@@ -82,21 +69,6 @@ public class BackgroundPreinitializer implements ApplicationListener<Application
}
}
private void awaitInitialization() {
Thread thread = this.initializationThread;
if (thread != null) {
try {
thread.join();
}
catch (InterruptedException ex) {
Thread.currentThread().interrupt();
}
finally {
this.initializationThread = null;
}
}
}
/**
* Early initializer for Spring MessageConverters.
*/
@@ -132,4 +104,5 @@ public class BackgroundPreinitializer implements ApplicationListener<Application
}
}
}