Author: ssmiweve Date: 2007-06-03 20:16:02 +0200 (Sun, 03 Jun 2007) New Revision: 5255
Modified: branches/2.13/war/src/webapp/WEB-INF/jsp/500.jsp Log: SEARCH-2609 - NPE in 500.jsp Modified: branches/2.13/war/src/webapp/WEB-INF/jsp/500.jsp =================================================================== --- branches/2.13/war/src/webapp/WEB-INF/jsp/500.jsp 2007-06-03 18:15:22 UTC (rev 5254) +++ branches/2.13/war/src/webapp/WEB-INF/jsp/500.jsp 2007-06-03 18:16:02 UTC (rev 5255) @@ -1,3 +1,31 @@ <%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %> +<%@ taglib uri="http://java.sun.com/jstl/core_rt"; prefix="c" %> <%@ taglib uri="/WEB-INF/SearchPortal.tld" prefix="search" %> -<search:velocity template="/pages/500"/> \ No newline at end of file + +<%-- The skinnable error message --%> +<c:catch var="error"> + <search:velocity template="/pages/500"/> +</c:catch> + +<%-- At the bare minimum display the following --%> +<c:if test="${!empty error || !empty Missing_pages500_Template}"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> +<html> + <head> + <title>500 - Internal error</title> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <link rel="icon" href="/images/favicon.gif" type="image/x-icon" /> + <link rel="shortcut icon" href="/images/favicon.gif" type="image/x-icon" /> + </head> + <body style="margin:0; padding:0;"> + <div style="width:100%; height:6px; background:#A6408E;"><img src="/images/pix.gif" width="1" height="6" alt="" /></div> + <img src="/images/logo.jpg" width="146" height="44" style="padding:20px 0 10px 30px;" alt="logo" /> + <div style="padding-left:30px; font-size:12px; font-family: arial, sans-serif;"> + <p>500 Internal Server Error + The server encountered an unexpected condition which prevented it from fulfilling the request.</p> + </div> + <hr/> + <c:out var="${error}"/> + </body> +</html> +</c:if> \ No newline at end of file _______________________________________________ Kernel-commits mailing list [email protected] http://sesat.no/mailman/listinfo/kernel-commits
