Merge pull request #120 from kngenie/WWM-330

Pass CompositeResource to JSP for revisits so that JSP have access to…
internetarchive · Mar 9, 2016 · 09ae91f · 09ae91f
2 parents 8118b47 + d7e780f
commit 09ae91f
Showing 1 changed file with 3 additions and 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
@@ -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);
 	}
 }