Avoid NPE in error controller

2013-08-18 18:05:46 +01:00
parent 3fc8752a37
commit 4c4e013c5e
1 changed files with 1 additions and 1 deletions
--- 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());