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

Merge branch '1.5.x' into 2.0.x

Browse Source
This commit is contained in:
Phillip Webb
2018-05-25 18:45:37 -07:00
parent 606eb9dda3 e69296d7d3
commit 21d80d87a3
94 changed files with 401 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-samples/spring-boot-sample-atmosphere/src/main/java/sample/atmosphere/SampleAtmosphereApplication.java
View File

@@ -59,6 +59,10 @@ public class SampleAtmosphereApplication {
return registration;
}
public static void main(String[] args) throws Exception {
SpringApplication.run(SampleAtmosphereApplication.class, args);
}
@Configuration
static class MvcConfiguration implements WebMvcConfigurer {
@@ -79,8 +83,4 @@ public class SampleAtmosphereApplication {
}
public static void main(String[] args) {
SpringApplication.run(SampleAtmosphereApplication.class, args);
}
}