FIX NullPointerException in ServerRelativeArchivalRedirect for non-re…

…play requests.

wayback-core/src/main/java/org/archive/wayback/webapp/ServerRelativeArchivalRedirect.java

@@ -166,6 +166,7 @@ private String handleRequestWithCollection(HttpServletRequest httpRequest,
 			HttpServletResponse httpResponse) throws ServletException,
 			IOException {
 		ArchivalUrlRef ref = getOrigin(httpRequest);
+		if (ref == null) return null;
 
 		String thisPath = httpRequest.getRequestURI();
 		String queryString = httpRequest.getQueryString();
@@ -204,6 +205,7 @@ private String handleRequestWithoutCollection(
 			throws ServletException, IOException {
 
 		ArchivalUrlRef ref = getOrigin(httpRequest);
+		if (ref == null) return null;
 
 		String thisPath = httpRequest.getRequestURI();
 		String queryString = httpRequest.getQueryString();

wayback-core/src/test/java/org/archive/wayback/webapp/ServerRelativeArchivalRedirectTest.java

@@ -162,4 +162,26 @@ public void testCustomOrigin() throws Exception {
 		assertTrue(handled);
 	}
 
+	/**
+	 * Test of non-ArchivalUrl requests.
+	 * ServerRelativeArchivalRedirect is setup as catch-all handler ("{@code +"}).
+	 * It must handle non-replay URLs like {@code /} and {@code /favicon.ico}, with
+	 * non-ArchivalUrl Referer. It must not fail, and return {@code false}.
+	 * @throws Exception
+	 */
+	public void testNonArchivalUrl() throws Exception {
+		final String REQUEST_URI = "/";
+		final String REFERER = "http://www.example.com/index.html";
+
+		setUpRequest(REQUEST_URI, REFERER);
+
+		HttpServletResponse response = EasyMock.createMock(HttpServletResponse.class);
+		// no actions on response
+		EasyMock.replay(request, response);
+
+		boolean handled = cut.handleRequest(request, response);
+
+		EasyMock.verify(response);
+		assertFalse(handled);
+	}
 }