Merge branch '1.2.x'

2015-12-10 15:01:29 +00:00
parent 66fe95369c 2694605a4d
commit 2d2e4eea82
7 changed files with 62 additions and 50 deletions
--- a/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiOutput.java
+++ b/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiOutput.java
@@ -133,19 +133,15 @@ public abstract class AnsiOutput {

 	private static boolean isEnabled() {
 		if (enabled == Enabled.DETECT) {
-			return detectIfAnsiCapable();
+			if (ansiCapable == null) {
+				ansiCapable = detectIfAnsiCapable();
+			}
+			return ansiCapable;
 		}
 		return enabled == Enabled.ALWAYS;
 	}

 	private static boolean detectIfAnsiCapable() {
-		if (ansiCapable == null) {
-			ansiCapable = doDetectIfAnsiCapable();
-		}
-		return ansiCapable;
-	}
-
-	private static boolean doDetectIfAnsiCapable() {
 		try {
 			if (Boolean.FALSE.equals(consoleAvailable)) {
 				return false;