From d7e780fb16c9c2a34a4d6c70d1b27f5927414947 Mon Sep 17 00:00:00 2001 From: Kenji Nagahashi Date: Tue, 8 Mar 2016 13:38:20 -0800 Subject: [PATCH] Pass CompositeResource to JSP for revisits so that JSP have access to HTTP headers in revisit record. (WWM-330) --- .../java/org/archive/wayback/replay/JSPReplayRenderer.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wayback-core/src/main/java/org/archive/wayback/replay/JSPReplayRenderer.java b/wayback-core/src/main/java/org/archive/wayback/replay/JSPReplayRenderer.java index e3d2c0317f..6edbda933e 100644 --- a/wayback-core/src/main/java/org/archive/wayback/replay/JSPReplayRenderer.java +++ b/wayback-core/src/main/java/org/archive/wayback/replay/JSPReplayRenderer.java @@ -79,7 +79,9 @@ public void renderResource(HttpServletRequest httpRequest, Resource payloadResource, ResultURIConverter uriConverter, CaptureSearchResults results) throws ServletException, IOException, WaybackException { + final Resource resource = payloadResource == httpHeadersResource ? payloadResource + : new CompositeResource(httpHeadersResource, payloadResource); renderResource(httpRequest, httpResponse, wbRequest, result, - payloadResource, uriConverter, results); + resource, uriConverter, results); } }