cvs commit: jahia/core/src/java/org/jahia/services/webdav JahiaWebdavBaseService.java

[Thomas Draier]

tdraier     2004/08/23 17:08:08 CEST

  Modified files:
    core/src/java/org/jahia/services/webdav 
                                            JahiaWebdavBaseService.java 
  Log:
  check "lock file on publication" parameter when moving a file
  
  Revision  Changes    Path
  1.5       +7 -4      
jahia/core/src/java/org/jahia/services/webdav/JahiaWebdavBaseService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/webdav/JahiaWebdavBaseService.java.diff?r1=1.4&r2=1.5&f=h
  
  
  
  Index: JahiaWebdavBaseService.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/services/webdav/JahiaWebdavBaseService.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JahiaWebdavBaseService.java       28 Jun 2004 15:33:38 -0000      1.4
  +++ JahiaWebdavBaseService.java       23 Aug 2004 15:08:08 -0000      1.5
  @@ -25,6 +25,7 @@
   import org.jahia.utils.JahiaTools;
   import org.jahia.content.ContentContainerListsXRefManager;
   import org.jahia.content.ContentFieldXRefManager;
  +import org.jahia.bin.Jahia;
   
   import java.io.File;
   import java.sql.*;
  @@ -365,10 +366,12 @@
                       if (oldfile.isValid () && oldfile.hasRevisions ()) {
                           oldfile.unlockFile (true);
                       }
  -                    DAVFileAccess newfile = JahiaWebdavBaseService.getInstance ().
  -                            getDAVFileAccess (site, newVal);
  -                    if (newfile.isValid () && newfile.hasRevisions ()) {
  -                        newfile.lockFile (true);
  +                    if (Jahia.getSettings().isFileLockOnPublication()) {
  +                        DAVFileAccess newfile = JahiaWebdavBaseService.getInstance 
().
  +                                getDAVFileAccess (site, newVal);
  +                        if (newfile.isValid () && newfile.hasRevisions ()) {
  +                            newfile.lockFile (true);
  +                        }
                       }
                   }
                   ContentField.removeFromCache (v.getId ());