Avoid NPE in error controller

4c4e013c · Dave Syer · Phillip Webb · 3fc8752a · 4c4e013c
Commit 4c4e013c authored Aug 18, 2013 by Dave Syer Committed by Phillip Webb Sep 06, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

BasicErrorController.java ...pringframework/boot/actuate/web/BasicErrorController.java +1 -1

No files found.
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/BasicErrorController.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/BasicErrorController.java
@@ -84,7 +84,7 @@ public class BasicErrorController implements ErrorController {
 			}
 			map.put("status", status);
 			if (error != null) {
-				while (error instanceof ServletException) {
+				while (error instanceof ServletException && error.getCause() != null) {
 					error = ((ServletException) error).getCause();
 				}
 				map.put("exception", error.getClass().getName());