Merge branch '1.1.x'

Author: jgrandja

samples/demo-authorizationserver/src/main/java/sample/web/DefaultErrorController.java

@@ -21,6 +21,7 @@
 import org.springframework.boot.web.servlet.error.ErrorController;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 /**
@@ -44,7 +45,8 @@ public String handleError(Model model, HttpServletRequest request) {
 	}
 
 	private String getErrorMessage(HttpServletRequest request) {
-		return (String) request.getAttribute(RequestDispatcher.ERROR_MESSAGE);
+		String errorMessage = (String) request.getAttribute(RequestDispatcher.ERROR_MESSAGE);
+		return StringUtils.hasText(errorMessage) ? errorMessage : "";
 	}
 
 }