juergen     02/04/04 21:44:10

  Modified:    src/webdav/server/org/apache/slide/webdav/method
                        PropFindMethod.java
  Log:
  Set response status before throwing an exception in method parseRequest().
  Use appropriate status code for each exception.
  (ralf)
  
  Revision  Changes    Path
  1.57      +11 -9     
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java
  
  Index: PropFindMethod.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- PropFindMethod.java       2 Apr 2002 04:51:21 -0000       1.56
  +++ PropFindMethod.java       5 Apr 2002 05:44:10 -0000       1.57
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v
 1.56 2002/04/02 04:51:21 msmith Exp $
  - * $Revision: 1.56 $
  - * $Date: 2002/04/02 04:51:21 $
  + * $Header: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v
 1.57 2002/04/05 05:44:10 juergen Exp $
  + * $Revision: 1.57 $
  + * $Date: 2002/04/05 05:44:10 $
    *
    * ====================================================================
    *
  @@ -229,6 +229,7 @@
                   element = (Element)element.getChildren().get(0);
                   }
                   catch (Exception e) {
  +                    resp.setStatus(WebdavStatus.SC_BAD_REQUEST);
                       throw new WebdavException(WebdavStatus.SC_BAD_REQUEST);
                   }
                   
  @@ -244,20 +245,21 @@
                       propFindType = FIND_ALL_PROP;
                   }
                   else {
  +                    resp.setStatus(WebdavStatus.SC_BAD_REQUEST);
                       throw new WebdavException(WebdavStatus.SC_BAD_REQUEST);
                   }
                   
               }
  -            catch (IOException  e){
  -                e.printStackTrace();
  -                throw new WebdavException(WebdavStatus.SC_INTERNAL_SERVER_ERROR);
  -            }
               catch (SAXException  e){
  -                e.printStackTrace();
  +                resp.setStatus(WebdavStatus.SC_BAD_REQUEST);
  +                throw new WebdavException(WebdavStatus.SC_BAD_REQUEST);
  +            }
  +            catch (IOException  e){
  +                resp.setStatus(WebdavStatus.SC_INTERNAL_SERVER_ERROR);
                   throw new WebdavException(WebdavStatus.SC_INTERNAL_SERVER_ERROR);
               }
               catch (ParserConfigurationException  e){
  -                e.printStackTrace();
  +                resp.setStatus(WebdavStatus.SC_INTERNAL_SERVER_ERROR);
                   throw new WebdavException(WebdavStatus.SC_INTERNAL_SERVER_ERROR);
               }
           }
  
  
  

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

Reply via email to