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

More sensible signature for servlet initializer

This commit is contained in:
Dave Syer 2013-11-07 13:40:49 +00:00
parent 1f922f49b0
commit 811bd32ce2
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/config/SampleWebSocketsApplication.java
View File

@ -36,8 +36,8 @@ import org.springframework.web.socket.support.PerConnectionWebSocketHandler;
public class SampleWebSocketsApplication extends SpringBootServletInitializer {
@Override
protected void configure(SpringApplicationBuilder application) {
application.sources(SampleWebSocketsApplication.class);
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
return application.sources(SampleWebSocketsApplication.class);
}
public static void main(String[] args) {

5
spring-boot/src/main/java/org/springframework/boot/web/SpringBootServletInitializer.java
View File

@ -86,7 +86,7 @@ public abstract class SpringBootServletInitializer implements WebApplicationInit
application.initializers(new ServletContextApplicationContextInitializer(
servletContext));
application.contextClass(AnnotationConfigEmbeddedWebApplicationContext.class);
configure(application);
application = configure(application);
return (WebApplicationContext) application.run();
}
@ -99,7 +99,8 @@ public abstract class SpringBootServletInitializer implements WebApplicationInit
* @param application a builder for the application context
* @see SpringApplicationBuilder
*/
protected void configure(SpringApplicationBuilder application) {
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
return application;
}
}