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

CIFS multi-threading changes, SLNG-11.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9553 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gary Spencer
2008-06-24 14:30:56 +00:00
parent e438c81d27
commit 5462b9c9bb
10 changed files with 469 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
source/java/org/alfresco/filesys/repo/ContentDiskDriver.java
View File

@@ -43,6 +43,7 @@ import org.alfresco.jlan.server.core.DeviceContext;
import org.alfresco.jlan.server.core.DeviceContextException;
import org.alfresco.jlan.server.filesys.AccessDeniedException;
import org.alfresco.jlan.server.filesys.AccessMode;
import org.alfresco.jlan.server.filesys.DirectoryNotEmptyException;
import org.alfresco.jlan.server.filesys.DiskInterface;
import org.alfresco.jlan.server.filesys.FileAttribute;
import org.alfresco.jlan.server.filesys.FileInfo;
@@ -1462,7 +1463,7 @@ public class ContentDiskDriver extends AlfrescoDiskDriver implements DiskInterfa
if ( ctx.hasStateTable())
{
FileState fstate = ctx.getStateTable().findFileState(path, false, true);
FileState fstate = ctx.getStateTable().findFileState(params.getPath(), false, true);
if ( fstate != null)
{
// Indicate that the file is open
@@ -1577,7 +1578,7 @@ public class ContentDiskDriver extends AlfrescoDiskDriver implements DiskInterfa
if ( ctx.hasStateTable())
{
FileState fstate = ctx.getStateTable().findFileState(path, true, true);
FileState fstate = ctx.getStateTable().findFileState( params.getPath(), true, true);
if ( fstate != null)
{
// Indicate that the file is open
@@ -1647,17 +1648,28 @@ public class ContentDiskDriver extends AlfrescoDiskDriver implements DiskInterfa
try
{
// get the node
// Get the node for the folder
NodeRef nodeRef = cifsHelper.getNodeRef(deviceRootNodeRef, dir);
if (nodeService.exists(nodeRef))
{
nodeService.deleteNode(nodeRef);
// Remove the file state
if ( ctx.hasStateTable())
ctx.getStateTable().removeFileState(dir);
// Check if the folder is empty
if ( cifsHelper.isFolderEmpty( nodeRef) == true) {
// Delete the folder node
nodeService.deleteNode(nodeRef);
// Remove the file state
if ( ctx.hasStateTable())
ctx.getStateTable().removeFileState(dir);
}
else
throw new DirectoryNotEmptyException( dir);
}
// done
if (logger.isDebugEnabled())
{
@@ -1768,6 +1780,14 @@ public class ContentDiskDriver extends AlfrescoDiskDriver implements DiskInterfa
if ( ctx.hasStateTable())
ctx.getStateTable().removeFileState(file.getFullName());
// Commit the current transaction
// sess.endTransaction();
// beginReadTransaction( sess);
if ( nodeService.exists( nodeRef))
System.out.println("Node still exists - " + file.getFullName());
}
catch (org.alfresco.repo.security.permissions.AccessDeniedException ex)
{