tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kin...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/servlet JspServlet.java
Date Wed, 10 Apr 2002 21:23:04 GMT
kinman      02/04/10 14:23:04

  Modified:    jasper/src/share/org/apache/jasper/compiler Tag:
                        tomcat_40_branch JspParseEventListener.java
               jasper/src/share/org/apache/jasper/servlet Tag:
                        tomcat_40_branch JspServlet.java
  Removed:     jasper/src/share/org/apache/jasper Tag: tomcat_40_branch
                        JasperError.java
  Log:
  - Fixed 7880.  Apply patch from head branch.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.33.2.4  +9 -9      jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java
  
  Index: JspParseEventListener.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
  retrieving revision 1.33.2.3
  retrieving revision 1.33.2.4
  diff -u -r1.33.2.3 -r1.33.2.4
  --- JspParseEventListener.java	4 Dec 2001 02:47:03 -0000	1.33.2.3
  +++ JspParseEventListener.java	10 Apr 2002 21:23:04 -0000	1.33.2.4
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
1.33.2.3 2001/12/04 02:47:03 larryi Exp $
  - * $Revision: 1.33.2.3 $
  - * $Date: 2001/12/04 02:47:03 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
1.33.2.4 2002/04/10 21:23:04 kinman Exp $
  + * $Revision: 1.33.2.4 $
  + * $Date: 2002/04/10 21:23:04 $
    *
    * ====================================================================
    *
  @@ -78,7 +78,6 @@
   import javax.servlet.jsp.tagext.TagLibraryInfo;
   import javax.servlet.jsp.tagext.ValidationMessage;
   
  -import org.apache.jasper.JasperError;
   import org.apache.jasper.JasperException;
   import org.apache.jasper.Constants;
   import org.apache.jasper.JspCompilationContext;
  @@ -1134,16 +1133,17 @@
                          new Object[]{tli.getShortName()}));
                   errMessage.append("</h3>");
                   for (int i = 0; i < errors.length; i++) {
  -                    errMessage.append("<p>");
  -                    errMessage.append(errors[i].getId());
  -                    errMessage.append(": ");
  +                    String id = errors[i].getId();
  +                    if (id != null) {
  +                        errMessage.append(errors[i].getId());
  +                        errMessage.append(": ");
  +                    }
                       errMessage.append(errors[i].getMessage());
  -                    errMessage.append("</p>");
                   }
               }
           }
   	if (hasErrors)
  -            throw new JasperError(errMessage.toString());
  +            throw new JasperException(errMessage.toString());
       }
   
       /**
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.21.2.7  +0 -4      jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/servlet/JspServlet.java
  
  Index: JspServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/servlet/JspServlet.java,v
  retrieving revision 1.21.2.6
  retrieving revision 1.21.2.7
  diff -u -r1.21.2.6 -r1.21.2.7
  --- JspServlet.java	2 Apr 2002 16:11:13 -0000	1.21.2.6
  +++ JspServlet.java	10 Apr 2002 21:23:04 -0000	1.21.2.7
  @@ -83,7 +83,6 @@
   import java.security.Policy;
   import java.security.PrivilegedAction;
   
  -import org.apache.jasper.JasperError;
   import org.apache.jasper.JasperException;
   import org.apache.jasper.Constants;
   import org.apache.jasper.Options;
  @@ -474,9 +473,6 @@
               serviceJspFile(request, response, jspUri, null, precompile);
   	} catch (RuntimeException e) {
   	    throw e;
  -        } catch (JasperError ex) {
  -            response.setContentType("text/html");
  -            response.getWriter().print(ex.getMessage());
   	} catch (ServletException e) {
   	    throw e;
   	} catch (IOException e) {
  
  
  

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


Mime
View raw message