juergen     02/01/17 10:11:25

  Modified:    src/webdav/server/org/apache/slide/webdav/method
                        PropPatchMethod.java
  Log:
  the virtual live properties "lockdiscovery" and "supportedlock" may not be modified 
by a proppatch command.
  
  Revision  Changes    Path
  1.25      +12 -4     
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.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- PropPatchMethod.java      9 Jan 2002 18:24:54 -0000       1.24
  +++ PropPatchMethod.java      17 Jan 2002 18:11:25 -0000      1.25
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropPatchMethod.java,v
 1.24 2002/01/09 18:24:54 juergen Exp $
  - * $Revision: 1.24 $
  - * $Date: 2002/01/09 18:24:54 $
  + * $Header: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropPatchMethod.java,v
 1.25 2002/01/17 18:11:25 juergen Exp $
  + * $Revision: 1.25 $
  + * $Date: 2002/01/17 18:11:25 $
    *
    * ====================================================================
    *
  @@ -448,7 +448,15 @@
        */
       private boolean checkPropertyModification(Property property, 
NodeRevisionDescriptor rd) {
           NodeProperty originalProperty = rd.getProperty(property.name, 
property.namespace);
  -        boolean result = originalProperty == null || 
!originalProperty.isProtected();
  +        boolean result;
  +        if (originalProperty == null) {
  +            // those virtual live properties can not be modified
  +            result = (!property.name.equals("lockdiscovery")) &&
  +                     (!property.name.equals("supportedlock"));
  +        }
  +        else {
  +            result = !originalProperty.isProtected();
  +        }
           if (!result) property.status = WebdavStatus.SC_CONFLICT;
           return result;
           
  
  
  

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

Reply via email to