juergen     2002/08/02 06:56:02

  Modified:    src/webdav/server/org/apache/slide/webdav/method
                        PutMethod.java
  Log:
  Do not use Content.create() but store() if the resource already exists (otherwise a 
checkin (due to auto-versioning) will fail).
  (ralf)
  
  Revision  Changes    Path
  1.54      +6 -6      
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java
  
  Index: PutMethod.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- PutMethod.java    26 Jun 2002 16:10:50 -0000      1.53
  +++ PutMethod.java    2 Aug 2002 13:56:02 -0000       1.54
  @@ -264,16 +264,16 @@
                   // Resource type
                   revisionDescriptor.setResourceType("");
                   
  -                content.create(slideToken, resourcePath, revisionDescriptor,
  +                content.store(slideToken, resourcePath, revisionDescriptor,
                                  revisionContent);
                   
  -                resp.setStatus(WebdavStatus.SC_NO_CONTENT);
  -                
                   // Changed for DeltaV --start--
                   if( Configuration.useVersionControl() && mustCheckIn) {
                       versioningHelper.checkin(revisionDescriptors, 
revisionDescriptor, false, false ); //forkOk=false, keepCheckedOut=false
                   }
                   // Changed for DeltaV --end--
  +                
  +                resp.setStatus(WebdavStatus.SC_NO_CONTENT);
                   
               } catch (LinkedObjectNotFoundException e) {
                   // Nothing we can do here ...
  
  
  

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

Reply via email to