From 60355e0e11aa3afc8526fabc6c77078ddb11cc34 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Mon, 31 Oct 2016 15:04:43 -0700
Subject: [PATCH] Fix ResourceHttpRequestHandler delegate

Fix ResourceHttpRequestHandler to set the ServletContext following the
Spring Framework update for SPR-14851.
---
 .../boot/actuate/endpoint/mvc/LogFileMvcEndpoint.java      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/LogFileMvcEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/LogFileMvcEndpoint.java
index b25a55f552..cd1d6028f0 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/LogFileMvcEndpoint.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/LogFileMvcEndpoint.java
@@ -19,6 +19,7 @@ package org.springframework.boot.actuate.endpoint.mvc;
 import java.io.File;
 import java.io.IOException;
 
+import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -82,7 +83,8 @@ public class LogFileMvcEndpoint extends AbstractMvcEndpoint {
 			}
 			resource = null;
 		}
-		new Handler(resource).handleRequest(request, response);
+		Handler handler = new Handler(resource, request.getServletContext());
+		handler.handleRequest(request, response);
 	}
 
 	private Resource getLogFileResource() {
@@ -104,10 +106,11 @@ public class LogFileMvcEndpoint extends AbstractMvcEndpoint {
 
 		private final Resource resource;
 
-		Handler(Resource resource) {
+		Handler(Resource resource, ServletContext servletContext) {
 			this.resource = resource;
 			getLocations().add(resource);
 			try {
+				setServletContext(servletContext);
 				afterPropertiesSet();
 			}
 			catch (Exception ex) {