tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler JspDocumentParser.java
Date Mon, 19 Jan 2004 10:34:30 GMT
remm        2004/01/19 02:34:30

  Modified:    jasper2/src/share/org/apache/jasper/compiler
                        JspDocumentParser.java
  Log:
  - Fix classcast exception is JSP document parser.
  - Bug 26191, submitted by Trond Aasan.
  
  Revision  Changes    Path
  1.75      +8 -9      jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java
  
  Index: JspDocumentParser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java,v
  retrieving revision 1.74
  retrieving revision 1.75
  diff -u -r1.74 -r1.75
  --- JspDocumentParser.java	25 Nov 2003 22:59:27 -0000	1.74
  +++ JspDocumentParser.java	19 Jan 2004 10:34:30 -0000	1.75
  @@ -230,13 +230,12 @@
   
           } catch (IOException ioe) {
               jspDocParser.err.jspError("jsp.error.data.file.read", path, ioe);
  +        } catch (SAXParseException e) {
  +            jspDocParser.err.jspError
  +                (new Mark(path, e.getLineNumber(), e.getColumnNumber()),
  +                 e.getMessage());
           } catch (Exception e) {
  -            jspDocParser.err.jspError(
  -                new Mark(
  -                    path,
  -                    ((SAXParseException)e).getLineNumber(),
  -                    ((SAXParseException)e).getColumnNumber()),
  -                e.getMessage());
  +            jspDocParser.err.jspError(e);
           }
   
           return pageNodes;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message