Mercurial Hosting > luan
changeset 821:292f2e31ab41
remove ErrorHandler.ErrorPageMapper
| author | Franklin Schmidt <fschmidt@gmail.com> |
|---|---|
| date | Wed, 14 Sep 2016 00:48:03 -0600 |
| parents | 8e9db0bbf4f9 |
| children | 0048a843297a |
| files | src/org/eclipse/jetty/server/AbstractHttpConnection.java src/org/eclipse/jetty/server/Server.java src/org/eclipse/jetty/server/handler/ErrorHandler.java |
| diffstat | 3 files changed, 190 insertions(+), 237 deletions(-) [+] |
line wrap: on
line diff
diff -r 8e9db0bbf4f9 -r 292f2e31ab41 src/org/eclipse/jetty/server/AbstractHttpConnection.java --- a/src/org/eclipse/jetty/server/AbstractHttpConnection.java Tue Sep 13 23:13:06 2016 -0600 +++ b/src/org/eclipse/jetty/server/AbstractHttpConnection.java Wed Sep 14 00:48:03 2016 -0600 @@ -502,17 +502,6 @@ _request.setAttribute(RequestDispatcher.ERROR_STATUS_CODE,new Integer(500)); _request.setAttribute(RequestDispatcher.ERROR_MESSAGE, _response.getReason()); _request.setDispatcherType(DispatcherType.ERROR); - - ErrorHandler eh = _request._async.getContextHandler().getErrorHandler(); - if (eh instanceof ErrorHandler.ErrorPageMapper) - { - String error_page=((ErrorHandler.ErrorPageMapper)eh).getErrorPage((HttpServletRequest)_request._async.getRequest()); - if (error_page!=null) - { - AsyncContinuation.AsyncEventState state = _request._async.getAsyncEventState(); - state.setPath(error_page); - } - } } else _request.setDispatcherType(DispatcherType.ASYNC);
diff -r 8e9db0bbf4f9 -r 292f2e31ab41 src/org/eclipse/jetty/server/Server.java --- a/src/org/eclipse/jetty/server/Server.java Tue Sep 13 23:13:06 2016 -0600 +++ b/src/org/eclipse/jetty/server/Server.java Wed Sep 14 00:48:03 2016 -0600 @@ -22,7 +22,6 @@ import java.net.InetSocketAddress; import java.util.Enumeration; -import javax.servlet.AsyncContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse;
diff -r 8e9db0bbf4f9 -r 292f2e31ab41 src/org/eclipse/jetty/server/handler/ErrorHandler.java --- a/src/org/eclipse/jetty/server/handler/ErrorHandler.java Tue Sep 13 23:13:06 2016 -0600 +++ b/src/org/eclipse/jetty/server/handler/ErrorHandler.java Wed Sep 14 00:48:03 2016 -0600 @@ -47,239 +47,204 @@ */ public class ErrorHandler extends AbstractHandler { - private static final Logger LOG = LoggerFactory.getLogger(ErrorHandler.class); - public final static String ERROR_PAGE="org.eclipse.jetty.server.error_page"; - - boolean _showStacks=true; - boolean _showMessageInTitle=true; - String _cacheControl="must-revalidate,no-cache,no-store"; - - /* ------------------------------------------------------------ */ - /* - * @see org.eclipse.jetty.server.server.Handler#handle(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, int) - */ - public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException - { - AbstractHttpConnection connection = AbstractHttpConnection.getCurrentConnection(); - String method = request.getMethod(); - if(!method.equals(HttpMethods.GET) && !method.equals(HttpMethods.POST) && !method.equals(HttpMethods.HEAD)) - { - connection.getRequest().setHandled(true); - return; - } - - if (this instanceof ErrorPageMapper) - { - String error_page=((ErrorPageMapper)this).getErrorPage(request); - if (error_page!=null && request.getServletContext()!=null) - { - String old_error_page=(String)request.getAttribute(ERROR_PAGE); - if (old_error_page==null || !old_error_page.equals(error_page)) - { - request.setAttribute(ERROR_PAGE, error_page); + private static final Logger LOG = LoggerFactory.getLogger(ErrorHandler.class); + public final static String ERROR_PAGE="org.eclipse.jetty.server.error_page"; + + boolean _showStacks=true; + boolean _showMessageInTitle=true; + String _cacheControl="must-revalidate,no-cache,no-store"; + + /* ------------------------------------------------------------ */ + /* + * @see org.eclipse.jetty.server.server.Handler#handle(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, int) + */ + public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException + { + AbstractHttpConnection connection = AbstractHttpConnection.getCurrentConnection(); + String method = request.getMethod(); + if(!method.equals(HttpMethods.GET) && !method.equals(HttpMethods.POST) && !method.equals(HttpMethods.HEAD)) + { + connection.getRequest().setHandled(true); + return; + } + + connection.getRequest().setHandled(true); + response.setContentType(MimeTypes.TEXT_HTML_8859_1); + if (_cacheControl!=null) + response.setHeader(HttpHeaders.CACHE_CONTROL, _cacheControl); + ByteArrayISO8859Writer writer= new ByteArrayISO8859Writer(4096); + handleErrorPage(request, writer, connection.getResponse().getStatus(), connection.getResponse().getReason()); + writer.flush(); + response.setContentLength(writer.size()); + writer.writeTo(response.getOutputStream()); + writer.destroy(); + } + + /* ------------------------------------------------------------ */ + protected void handleErrorPage(HttpServletRequest request, Writer writer, int code, String message) + throws IOException + { + writeErrorPage(request, writer, code, message, _showStacks); + } + + /* ------------------------------------------------------------ */ + protected void writeErrorPage(HttpServletRequest request, Writer writer, int code, String message, boolean showStacks) + throws IOException + { + if (message == null) + message=HttpStatus.getMessage(code); - Dispatcher dispatcher = (Dispatcher) request.getServletContext().getRequestDispatcher(error_page); - try - { - if(dispatcher!=null) - { - dispatcher.error(request, response); - return; - } - LOG.warn("No error page "+error_page); - } - catch (ServletException e) - { - LOG.warn("EXCEPTION", e); - return; - } - } - } - } - - connection.getRequest().setHandled(true); - response.setContentType(MimeTypes.TEXT_HTML_8859_1); - if (_cacheControl!=null) - response.setHeader(HttpHeaders.CACHE_CONTROL, _cacheControl); - ByteArrayISO8859Writer writer= new ByteArrayISO8859Writer(4096); - handleErrorPage(request, writer, connection.getResponse().getStatus(), connection.getResponse().getReason()); - writer.flush(); - response.setContentLength(writer.size()); - writer.writeTo(response.getOutputStream()); - writer.destroy(); - } + writer.write("<html>\n<head>\n"); + writeErrorPageHead(request,writer,code,message); + writer.write("</head>\n<body>"); + writeErrorPageBody(request,writer,code,message,showStacks); + writer.write("\n</body>\n</html>\n"); + } + + /* ------------------------------------------------------------ */ + protected void writeErrorPageHead(HttpServletRequest request, Writer writer, int code, String message) + throws IOException + { + writer.write("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=ISO-8859-1\"/>\n"); + writer.write("<title>Error "); + writer.write(Integer.toString(code)); + + if (_showMessageInTitle) + { + writer.write(' '); + write(writer,message); + } + writer.write("</title>\n"); + } - /* ------------------------------------------------------------ */ - protected void handleErrorPage(HttpServletRequest request, Writer writer, int code, String message) - throws IOException - { - writeErrorPage(request, writer, code, message, _showStacks); - } - - /* ------------------------------------------------------------ */ - protected void writeErrorPage(HttpServletRequest request, Writer writer, int code, String message, boolean showStacks) - throws IOException - { - if (message == null) - message=HttpStatus.getMessage(code); - - writer.write("<html>\n<head>\n"); - writeErrorPageHead(request,writer,code,message); - writer.write("</head>\n<body>"); - writeErrorPageBody(request,writer,code,message,showStacks); - writer.write("\n</body>\n</html>\n"); - } + /* ------------------------------------------------------------ */ + protected void writeErrorPageBody(HttpServletRequest request, Writer writer, int code, String message, boolean showStacks) + throws IOException + { + String uri= request.getRequestURI(); + + writeErrorPageMessage(request,writer,code,message,uri); + if (showStacks) + writeErrorPageStacks(request,writer); + writer.write("<hr /><i><small>Powered by Jetty://</small></i>"); + for (int i= 0; i < 20; i++) + writer.write("<br/> \n"); + } - /* ------------------------------------------------------------ */ - protected void writeErrorPageHead(HttpServletRequest request, Writer writer, int code, String message) - throws IOException - { - writer.write("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=ISO-8859-1\"/>\n"); - writer.write("<title>Error "); - writer.write(Integer.toString(code)); - - if (_showMessageInTitle) - { - writer.write(' '); - write(writer,message); - } - writer.write("</title>\n"); - } - - /* ------------------------------------------------------------ */ - protected void writeErrorPageBody(HttpServletRequest request, Writer writer, int code, String message, boolean showStacks) - throws IOException - { - String uri= request.getRequestURI(); - - writeErrorPageMessage(request,writer,code,message,uri); - if (showStacks) - writeErrorPageStacks(request,writer); - writer.write("<hr /><i><small>Powered by Jetty://</small></i>"); - for (int i= 0; i < 20; i++) - writer.write("<br/> \n"); - } + /* ------------------------------------------------------------ */ + protected void writeErrorPageMessage(HttpServletRequest request, Writer writer, int code, String message,String uri) + throws IOException + { + writer.write("<h2>HTTP ERROR "); + writer.write(Integer.toString(code)); + writer.write("</h2>\n<p>Problem accessing "); + write(writer,uri); + writer.write(". Reason:\n<pre> "); + write(writer,message); + writer.write("</pre></p>"); + } - /* ------------------------------------------------------------ */ - protected void writeErrorPageMessage(HttpServletRequest request, Writer writer, int code, String message,String uri) - throws IOException - { - writer.write("<h2>HTTP ERROR "); - writer.write(Integer.toString(code)); - writer.write("</h2>\n<p>Problem accessing "); - write(writer,uri); - writer.write(". Reason:\n<pre> "); - write(writer,message); - writer.write("</pre></p>"); - } + /* ------------------------------------------------------------ */ + protected void writeErrorPageStacks(HttpServletRequest request, Writer writer) + throws IOException + { + Throwable th = (Throwable)request.getAttribute("javax.servlet.error.exception"); + while(th!=null) + { + writer.write("<h3>Caused by:</h3><pre>"); + StringWriter sw = new StringWriter(); + PrintWriter pw = new PrintWriter(sw); + th.printStackTrace(pw); + pw.flush(); + write(writer,sw.getBuffer().toString()); + writer.write("</pre>\n"); - /* ------------------------------------------------------------ */ - protected void writeErrorPageStacks(HttpServletRequest request, Writer writer) - throws IOException - { - Throwable th = (Throwable)request.getAttribute("javax.servlet.error.exception"); - while(th!=null) - { - writer.write("<h3>Caused by:</h3><pre>"); - StringWriter sw = new StringWriter(); - PrintWriter pw = new PrintWriter(sw); - th.printStackTrace(pw); - pw.flush(); - write(writer,sw.getBuffer().toString()); - writer.write("</pre>\n"); + th =th.getCause(); + } + } + - th =th.getCause(); - } - } - - - /* ------------------------------------------------------------ */ - /** Get the cacheControl. - * @return the cacheControl header to set on error responses. - */ - public String getCacheControl() - { - return _cacheControl; - } + /* ------------------------------------------------------------ */ + /** Get the cacheControl. + * @return the cacheControl header to set on error responses. + */ + public String getCacheControl() + { + return _cacheControl; + } - /* ------------------------------------------------------------ */ - /** Set the cacheControl. - * @param cacheControl the cacheControl header to set on error responses. - */ - public void setCacheControl(String cacheControl) - { - _cacheControl = cacheControl; - } + /* ------------------------------------------------------------ */ + /** Set the cacheControl. + * @param cacheControl the cacheControl header to set on error responses. + */ + public void setCacheControl(String cacheControl) + { + _cacheControl = cacheControl; + } - /* ------------------------------------------------------------ */ - /** - * @return True if stack traces are shown in the error pages - */ - public boolean isShowStacks() - { - return _showStacks; - } + /* ------------------------------------------------------------ */ + /** + * @return True if stack traces are shown in the error pages + */ + public boolean isShowStacks() + { + return _showStacks; + } - /* ------------------------------------------------------------ */ - /** - * @param showStacks True if stack traces are shown in the error pages - */ - public void setShowStacks(boolean showStacks) - { - _showStacks = showStacks; - } - - /* ------------------------------------------------------------ */ - /** - * @param showMessageInTitle if true, the error message appears in page title - */ - public void setShowMessageInTitle(boolean showMessageInTitle) - { - _showMessageInTitle = showMessageInTitle; - } - - - /* ------------------------------------------------------------ */ - public boolean getShowMessageInTitle() - { - return _showMessageInTitle; - } + /* ------------------------------------------------------------ */ + /** + * @param showStacks True if stack traces are shown in the error pages + */ + public void setShowStacks(boolean showStacks) + { + _showStacks = showStacks; + } + + /* ------------------------------------------------------------ */ + /** + * @param showMessageInTitle if true, the error message appears in page title + */ + public void setShowMessageInTitle(boolean showMessageInTitle) + { + _showMessageInTitle = showMessageInTitle; + } + + + /* ------------------------------------------------------------ */ + public boolean getShowMessageInTitle() + { + return _showMessageInTitle; + } - /* ------------------------------------------------------------ */ - protected void write(Writer writer,String string) - throws IOException - { - if (string==null) - return; - - for (int i=0;i<string.length();i++) - { - char c=string.charAt(i); - - switch(c) - { - case '&' : - writer.write("&"); - break; - case '<' : - writer.write("<"); - break; - case '>' : - writer.write(">"); - break; - - default: - if (Character.isISOControl(c) && !Character.isWhitespace(c)) - writer.write('?'); - else - writer.write(c); - } - } - } - - /* ------------------------------------------------------------ */ - public interface ErrorPageMapper - { - String getErrorPage(HttpServletRequest request); - } + /* ------------------------------------------------------------ */ + protected void write(Writer writer,String string) + throws IOException + { + if (string==null) + return; + + for (int i=0;i<string.length();i++) + { + char c=string.charAt(i); + + switch(c) + { + case '&' : + writer.write("&"); + break; + case '<' : + writer.write("<"); + break; + case '>' : + writer.write(">"); + break; + + default: + if (Character.isISOControl(c) && !Character.isWhitespace(c)) + writer.write('?'); + else + writer.write(c); + } + } + } }