Attachment #30157 for bug #54802

View | Details | Raw Unified | Return to bug 54802
Collapse All | Expand All

Lines 259-267 Link Here

(-)java/org/apache/catalina/core/StandardWrapperValve.java (-2 / +2 lines)
259	Throwable rootCause = StandardWrapper.getRootCause(e);	259	Throwable rootCause = StandardWrapper.getRootCause(e);
260	if (!(rootCause instanceof ClientAbortException)) {	260	if (!(rootCause instanceof ClientAbortException)) {
261	container.getLogger().error(sm.getString(	261	container.getLogger().error(sm.getString(
262	"standardWrapper.serviceExceptionRoot",	262	"standardWrapper.serviceException",
263	wrapper.getName(), context.getName(), e.getMessage()),	263	wrapper.getName(), context.getName(), e.getMessage()),
264	rootCause);	264	e);
265	}	265	}
266	throwable = e;	266	throwable = e;
267	exception(request, response, e);	267	exception(request, response, e);

Lines 266-271 Link Here

(-)java/org/apache/jasper/compiler/ErrorDispatcher.java (+4 lines)
266	dispatch(null, null, null, e);	266	dispatch(null, null, null, e);
267	}	267	}
268		268
		269	public void jspError(Mark where, Exception e) throws JasperException {
		270	dispatch(where, null, null, e);
		271	}
		272
269	/*	273	/*
270	* Dispatches the given JSP parse error to the configured error handler.	274	* Dispatches the given JSP parse error to the configured error handler.
271	*	275	*

Lines 205-211 Link Here

(-)java/org/apache/jasper/compiler/JspDocumentParser.java (-1 / +1 lines)
205	jspDocParser.err.jspError	205	jspDocParser.err.jspError
206	(new Mark(jspDocParser.ctxt, path, e.getLineNumber(),	206	(new Mark(jspDocParser.ctxt, path, e.getLineNumber(),
207	e.getColumnNumber()),	207	e.getColumnNumber()),
208	e.getMessage());	208	e);
209	} catch (Exception e) {	209	} catch (Exception e) {
210	jspDocParser.err.jspError(e);	210	jspDocParser.err.jspError(e);
211	}	211	}

Return to bug 54802