commit
135ebb8ded
|
|
@ -16,10 +16,10 @@
|
|||
|
||||
package org.springframework.boot.autoconfigure.mustache.web;
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.InputStream;
|
||||
import java.util.Locale;
|
||||
|
||||
import org.fusesource.hawtbuf.ByteArrayInputStream;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
|
|
|
|||
|
|
@ -1824,8 +1824,8 @@ inside a war will break Spring Boot applications.
|
|||
If you need to perform servlet context initialization in a Spring Boot application, you
|
||||
should register a bean that implements the
|
||||
`org.springframework.boot.context.embedded.ServletContextInitializer` interface. The
|
||||
single `onStartup` method provides access to the `ServletContext`, and can easily be used
|
||||
as an adapter to an existing `WebApplicationInitializer if necessary.
|
||||
single `onStartup` method provides access to the `ServletContext`, and can easily be used
|
||||
as an adapter to an existing `WebApplicationInitializer` if necessary.
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
|||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
@RestController
|
||||
public class LaunchVerficationController {
|
||||
public class LaunchVerificationController {
|
||||
|
||||
@RequestMapping("/")
|
||||
public String verifyLaunch() {
|
||||
|
|
@ -829,7 +829,7 @@ public class SpringApplication {
|
|||
}
|
||||
try {
|
||||
try {
|
||||
handeExitCode(context, exception);
|
||||
handleExitCode(context, exception);
|
||||
listeners.finished(context, exception);
|
||||
}
|
||||
finally {
|
||||
|
|
@ -856,7 +856,7 @@ public class SpringApplication {
|
|||
}
|
||||
}
|
||||
|
||||
private void handeExitCode(ConfigurableApplicationContext context,
|
||||
private void handleExitCode(ConfigurableApplicationContext context,
|
||||
Throwable exception) {
|
||||
int exitCode = getExitCodeFromException(context, exception);
|
||||
if (exitCode != 0) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue