Merge branch '1.5.x'

2017-07-19 10:23:23 -07:00
parent 10bcf60803 68910f2b8f
commit 9db72450da
7 changed files with 45 additions and 36 deletions
--- a/spring-boot-docs/src/main/java/org/springframework/boot/ExitCodeApplication.java
+++ b/spring-boot-docs/src/main/java/org/springframework/boot/ExitCodeApplication.java
@@ -28,15 +28,15 @@ import org.springframework.context.annotation.Bean;
@SpringBootApplication
 public class ExitCodeApplication {

-	public static void main(String[] args) {
-		System.exit(SpringApplication.exit(
-				SpringApplication.run(ExitCodeApplication.class, args)));
-	}
-
 	@Bean
 	public ExitCodeGenerator exitCodeGenerator() {
 		return () -> 42;
 	}

+	public static void main(String[] args) {
+		System.exit(SpringApplication
+				.exit(SpringApplication.run(ExitCodeApplication.class, args)));
+	}
+
 }
 // end::example[]