From 6ec767437a30240d1250102553f0ec0b16375167 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Mon, 30 Nov 2015 14:20:37 +0000
Subject: [PATCH] Fix server.error.path reference in error controller

---
 .../boot/actuate/endpoint/mvc/ManagementErrorEndpoint.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/ManagementErrorEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/ManagementErrorEndpoint.java
index e795bd1f76..4030d78189 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/ManagementErrorEndpoint.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/ManagementErrorEndpoint.java
@@ -43,7 +43,7 @@ public class ManagementErrorEndpoint {
 		this.errorAttributes = errorAttributes;
 	}
 
-	@RequestMapping("${server.path:/error}")
+	@RequestMapping("${server.error.path:${error.path:/error}}")
 	@ResponseBody
 	public Map<String, Object> invoke() {
 		return this.errorAttributes.getErrorAttributes(