Commit 60355e0e authored by Phillip Webb's avatar Phillip Webb

Fix ResourceHttpRequestHandler delegate

Fix ResourceHttpRequestHandler to set the ServletContext following the
Spring Framework update for SPR-14851.
parent cdcc3d2f
...@@ -19,6 +19,7 @@ package org.springframework.boot.actuate.endpoint.mvc; ...@@ -19,6 +19,7 @@ package org.springframework.boot.actuate.endpoint.mvc;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import javax.servlet.ServletContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
...@@ -82,7 +83,8 @@ public class LogFileMvcEndpoint extends AbstractMvcEndpoint { ...@@ -82,7 +83,8 @@ public class LogFileMvcEndpoint extends AbstractMvcEndpoint {
} }
resource = null; resource = null;
} }
new Handler(resource).handleRequest(request, response); Handler handler = new Handler(resource, request.getServletContext());
handler.handleRequest(request, response);
} }
private Resource getLogFileResource() { private Resource getLogFileResource() {
...@@ -104,10 +106,11 @@ public class LogFileMvcEndpoint extends AbstractMvcEndpoint { ...@@ -104,10 +106,11 @@ public class LogFileMvcEndpoint extends AbstractMvcEndpoint {
private final Resource resource; private final Resource resource;
Handler(Resource resource) { Handler(Resource resource, ServletContext servletContext) {
this.resource = resource; this.resource = resource;
getLocations().add(resource); getLocations().add(resource);
try { try {
setServletContext(servletContext);
afterPropertiesSet(); afterPropertiesSet();
} }
catch (Exception ex) { catch (Exception ex) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment