luehe 2002/11/04 12:43:07 Modified: jasper2/src/share/org/apache/jasper/compiler DefaultErrorHandler.java Log: simplified impl of jspError() now that errMsg is always guaranteed to be non-null Revision Changes Path 1.5 +6 -15 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/DefaultErrorHandler.java Index: DefaultErrorHandler.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/DefaultErrorHandler.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- DefaultErrorHandler.java 22 Oct 2002 21:59:57 -0000 1.4 +++ DefaultErrorHandler.java 4 Nov 2002 20:43:07 -0000 1.5 @@ -91,13 +91,8 @@ */ public void jspError(String fname, int line, int column, String errMsg, Exception ex) throws JasperException { - if (errMsg != null) { - throw new JasperException(fname + "(" + line + "," + column + ")" - + " " + errMsg); - } else { - throw new JasperException(fname + "(" + line + "," + column + ")" - + " " + ex); - } + throw new JasperException(fname + "(" + line + "," + column + ")" + + " " + errMsg, ex); } /* @@ -107,11 +102,7 @@ * @param exception Parse exception */ public void jspError(String errMsg, Exception ex) throws JasperException { - if (errMsg != null) { - throw new JasperException(errMsg); - } else { - throw new JasperException(ex); - } + throw new JasperException(errMsg, ex); } /*
-- To unsubscribe, e-mail: <mailto:tomcat-dev-unsubscribe@;jakarta.apache.org> For additional commands, e-mail: <mailto:tomcat-dev-help@;jakarta.apache.org>