inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 3.2 to HEAD:

Browse Source 
17443: Port fix for cannot delete file via CIFS that has a thumbnail associated with it. ETHREEOH-3143 and ETHREEOH-3115.
          Port fix for CIFS/Kerberos/SPNEGO logon problem with Win2008/Win7 client. ETHREEOH-3225.
   17444: Update svn:mergeinfo (Record-only)
   17512: Fix for no sites in AVM folder via CIFS/FTP when Kerberos auth enabled. ETHREEOH-3080.
   17849: Re-use open files for the same session/process id. Port of ETWOTWO-1250.
   17853: Rewrite the rename file logic to handle MS Office file rename patterns. Port of ETHREEOH-1951.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18269 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gary Spencer
2010-01-25 13:18:15 +00:00
parent 999609e17c
commit 9436fbb567
5 changed files with 427 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/java/org/alfresco/filesys/state/FileState.java
View File

@@ -56,6 +56,7 @@ public class FileState
public final static long NoTimeout = -1L;
public final static long DefTimeout = 2 * 60000L; // 2 minutes
public final static long RenameTimeout = 1 * 60000L; // 1 minute
public final static long DeleteTimeout = 15000L; // 15 seconds
// File status