cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/method PropPatchMethod.java

[juergen]

juergen     01/02/14 04:35:23

  Modified:    src/webdav/server/org/apache/slide/webdav/method
                        PropPatchMethod.java
  Log:
  in case of a propPatch was executed against a resource, which did not exist, the 
correct response code was overwritten by the multi status response code.
  
  Revision  Changes    Path
  1.8       +9 -7      
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropPatchMethod.java
  
  Index: PropPatchMethod.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropPatchMethod.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- PropPatchMethod.java      2001/02/14 12:30:50     1.7
  +++ PropPatchMethod.java      2001/02/14 12:35:21     1.8
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropPatchMethod.java,v
 1.7 2001/02/14 12:30:50 juergen Exp $
  - * $Revision: 1.7 $
  - * $Date: 2001/02/14 12:30:50 $
  + * $Header: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropPatchMethod.java,v
 1.8 2001/02/14 12:35:21 juergen Exp $
  + * $Revision: 1.8 $
  + * $Date: 2001/02/14 12:35:21 $
    *
    * ====================================================================
    *
  @@ -297,6 +297,8 @@
               
               // TEMP !!!! We should do a store instead !!
               content.create(slideToken, resourcePath, revisionDescriptor, null);
  +
  +            resp.setStatus(WebdavStatus.SC_MULTI_STATUS);
                 
           } catch(RevisionAlreadyExistException e) {
               // 500 - Internal server error
  @@ -308,9 +310,9 @@
               System.out.println(e.getMessage());
               resp.setStatus(WebdavStatus.SC_NOT_FOUND);
           } catch (ObjectNotFoundException e) {
  -                // 404 - Not found
  -                System.out.println(e.getMessage());
  -                resp.setStatus(WebdavStatus.SC_NOT_FOUND);
  +            // 404 - Not found
  +            System.out.println(e.getMessage());
  +            resp.setStatus(WebdavStatus.SC_NOT_FOUND);
           } catch (AccessDeniedException e) {
               // 403 - Forbidden
               System.out.println(e.getMessage());
  @@ -331,8 +333,8 @@
               throw new WebdavException(WebdavStatus.SC_INTERNAL_SERVER_ERROR);
           }
           
  +
           // No serious errors. Printing the XML report.
  -        resp.setStatus(WebdavStatus.SC_MULTI_STATUS);
           writeReport();
           
       }
  @@ -549,9 +551,9 @@
       try {
               Writer writer = resp.getWriter();
           
  -//System.out.println();
  -//System.out.println("PropPatch XML = " + generatedXML.toString());
  -//System.out.println();
  +System.out.println();
  +System.out.println("PropPatch XML = " + generatedXML.toString());
  +System.out.println();
           
           
               writer.write(generatedXML.toString());