cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/util VersioningHelper.java

[juergen]

juergen     02/04/15 04:45:10

  Modified:    src/webdav/server/org/apache/slide/webdav/util
                        VersioningHelper.java
  Log:
  Correctly set/remove properties <predecessor-set>, <checkout-fork>, <checkin-fork> 
in checkout/checkin.
  (ralf)
  
  Revision  Changes    Path
  1.30      +14 -3     
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java
  
  Index: VersioningHelper.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- VersioningHelper.java     15 Apr 2002 11:04:57 -0000      1.29
  +++ VersioningHelper.java     15 Apr 2002 11:45:10 -0000      1.30
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java,v
 1.29 2002/04/15 11:04:57 juergen Exp $
  - * $Revision: 1.29 $
  - * $Date: 2002/04/15 11:04:57 $
  + * $Header: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java,v
 1.30 2002/04/15 11:45:10 juergen Exp $
  + * $Revision: 1.30 $
  + * $Date: 2002/04/15 11:45:10 $
    *
    * ====================================================================
    *
  @@ -567,6 +567,14 @@
                   new NodeProperty(P_CHECKED_OUT, cinProp.getValue()) );
               rNrd.setProperty(
                   new NodeProperty(P_PREDECESSOR_SET, cinProp.getValue()) );
  +            NodeProperty property = cinNrd.getProperty(P_CHECKOUT_FORK);
  +            if (property != null) {
  +                rNrd.setProperty(property);
  +            }
  +            property = cinNrd.getProperty(P_CHECKIN_FORK);
  +            if (property != null) {
  +                rNrd.setProperty(property);
  +            }
               
               if (isAutoVersionCheckout) {
                   NodeLock writeLock = getWriteLock(sToken, rNrds);
  @@ -828,6 +836,9 @@
               rNrd.setProperty(
                   new NodeProperty(P_CHECKED_IN, pHelp.createHrefValue(vrUriNew)) );
               rNrd.removeProperty(new 
NodeProperty(VersioningHelper.P_CHECKIN_LOCKTOKEN, null, true));
  +            rNrd.removeProperty(P_PREDECESSOR_SET);
  +            rNrd.removeProperty(P_CHECKOUT_FORK);
  +            rNrd.removeProperty(P_CHECKIN_FORK);
               
               vhrNrd.setLastModified( new Date() ); // P_GETLASTMODIFIED
               vhrNrd.setProperty( new NodeProperty(
  
  
  

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