cvs commit: jakarta-struts/src/share/org/apache/struts/action ActionServlet.java

[dgraham]

dgraham     2003/07/02 21:44:13

  Modified:    src/share/org/apache/struts/action ActionServlet.java
  Log:
  Throw more descriptive exception if web.xml isn't found.  PR# 21203.
  
  Revision  Changes    Path
  1.158     +9 -4      
jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java
  
  Index: ActionServlet.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java,v
  retrieving revision 1.157
  retrieving revision 1.158
  diff -u -r1.157 -r1.158
  --- ActionServlet.java        3 Jul 2003 03:43:37 -0000       1.157
  +++ ActionServlet.java        3 Jul 2003 04:44:13 -0000       1.158
  @@ -1082,6 +1082,11 @@
   
           InputStream input =
               getServletContext().getResourceAsStream("/WEB-INF/web.xml");
  +            
  +        if (input == null) {
  +            log.error(internal.getMessage("configWebXml"));
  +            throw new ServletException(internal.getMessage("configWebXml"));
  +        }
   
           try {
               digester.parse(input);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]