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

Merge branch '1.2.x'

This commit is contained in:
Andy Wilkinson 2015-12-10 11:25:00 +00:00
parent 267fd5dff2 b36fe2cbd8
commit 53cc5f060b
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
spring-boot/src/main/java/org/springframework/boot/ansi/AnsiOutput.java
View File

@ -32,6 +32,8 @@ public abstract class AnsiOutput {
private static Boolean consoleAvailable; private static Boolean consoleAvailable;
private static Boolean ansiCapable;
private static final String OPERATING_SYSTEM_NAME = System.getProperty("os.name") private static final String OPERATING_SYSTEM_NAME = System.getProperty("os.name")
.toLowerCase(); .toLowerCase();
@ -131,12 +133,19 @@ public abstract class AnsiOutput {
private static boolean isEnabled() { private static boolean isEnabled() {
if (enabled == Enabled.DETECT) { if (enabled == Enabled.DETECT) {
return detectIfEnabled(); return detectIfAnsiCapable();
} }
return enabled == Enabled.ALWAYS; return enabled == Enabled.ALWAYS;
} }
private static boolean detectIfEnabled() { private static boolean detectIfAnsiCapable() {
if (ansiCapable == null) {
ansiCapable = doDetectIfAnsiCapable();
}
return ansiCapable;
}
private static boolean doDetectIfAnsiCapable() {
try { try {
if (Boolean.FALSE.equals(consoleAvailable)) { if (Boolean.FALSE.equals(consoleAvailable)) {
return false; return false;