Skip to content

Commit 60355e0

Browse files
committed
Fix ResourceHttpRequestHandler delegate
Fix ResourceHttpRequestHandler to set the ServletContext following the Spring Framework update for SPR-14851.
1 parent cdcc3d2 commit 60355e0

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/LogFileMvcEndpoint.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.io.File;
2020
import java.io.IOException;
2121

22+
import javax.servlet.ServletContext;
2223
import javax.servlet.ServletException;
2324
import javax.servlet.http.HttpServletRequest;
2425
import javax.servlet.http.HttpServletResponse;
@@ -82,7 +83,8 @@ public void invoke(HttpServletRequest request, HttpServletResponse response)
8283
}
8384
resource = null;
8485
}
85-
new Handler(resource).handleRequest(request, response);
86+
Handler handler = new Handler(resource, request.getServletContext());
87+
handler.handleRequest(request, response);
8688
}
8789

8890
private Resource getLogFileResource() {
@@ -104,10 +106,11 @@ private static class Handler extends ResourceHttpRequestHandler {
104106

105107
private final Resource resource;
106108

107-
Handler(Resource resource) {
109+
Handler(Resource resource, ServletContext servletContext) {
108110
this.resource = resource;
109111
getLocations().add(resource);
110112
try {
113+
setServletContext(servletContext);
111114
afterPropertiesSet();
112115
}
113116
catch (Exception ex) {

0 commit comments

Comments
 (0)