diff --git a/source/java/org/alfresco/filesys/repo/BufferedContentDiskDriver.java b/source/java/org/alfresco/filesys/repo/BufferedContentDiskDriver.java index be80fc7653..b036204325 100644 --- a/source/java/org/alfresco/filesys/repo/BufferedContentDiskDriver.java +++ b/source/java/org/alfresco/filesys/repo/BufferedContentDiskDriver.java @@ -305,7 +305,8 @@ public class BufferedContentDiskDriver implements ExtendedDiskInterface, if(logger.isDebugEnabled()) { - logger.debug("getFileInformation path" + path + ", returning:" + finfo + + logger.debug("Return getFileInformation, path: " + path + + ", returning:" + finfo + ", readOnly:" +finfo.isReadOnly() + ", fileId:" +finfo.getFileId() + ", fileSize:" +finfo.getSize() + @@ -324,7 +325,7 @@ public class BufferedContentDiskDriver implements ExtendedDiskInterface, if(logger.isDebugEnabled()) { - logger.debug("getFileInformation returning:" + path + " returning" + info); + logger.debug("getFileInformation Return:" + path + " returning" + info); } return info; diff --git a/source/java/org/alfresco/filesys/repo/ContentDiskDriver2.java b/source/java/org/alfresco/filesys/repo/ContentDiskDriver2.java index 39e8f3b036..9ed626c10b 100644 --- a/source/java/org/alfresco/filesys/repo/ContentDiskDriver2.java +++ b/source/java/org/alfresco/filesys/repo/ContentDiskDriver2.java @@ -818,6 +818,9 @@ public class ContentDiskDriver2 extends AlfrescoDiskDriver implements ExtendedD { logger.debug("Started search: search path=" + searchPath + " attributes=" + attributes + ", ctx=" + searchCtx); } + + // TODO -- + // Need to resolve the file info here so it's within the transaction boundary. return searchCtx; } @@ -1093,7 +1096,8 @@ public class ContentDiskDriver2 extends AlfrescoDiskDriver implements ExtendedD } else if ( params.isWriteOnlyAccess()) { - netFile.setGrantedAccess( NetworkFile.WRITEONLY); + // Needs to be READWRITE for JavaNetworkFile - there's no such thing as WRITEONLY! + netFile.setGrantedAccess( NetworkFile.READWRITE); } else { @@ -1867,7 +1871,7 @@ public class ContentDiskDriver2 extends AlfrescoDiskDriver implements ExtendedD { if(logger.isDebugEnabled()) { - logger.debug("write access denied to : + name"); + logger.debug("write access denied to :" + name); } throw new AccessDeniedException("No write access to " + name); } @@ -1880,12 +1884,12 @@ public class ContentDiskDriver2 extends AlfrescoDiskDriver implements ExtendedD { if(logger.isDebugEnabled()) { - logger.debug("delete access denied to : + name"); + logger.debug("Set Delete On Close for :" + name); } // Check for delete permission if ( permissionService.hasPermission(nodeRef, PermissionService.DELETE) == AccessStatus.DENIED) { - throw new AccessDeniedException("No delete access to " + name); + throw new AccessDeniedException("No delete access to :" + name); } // Check if the node is locked @@ -2100,6 +2104,10 @@ public class ContentDiskDriver2 extends AlfrescoDiskDriver implements ExtendedD } catch (IOException ex) { + if(logger.isDebugEnabled()) + { + logger.debug("unable to truncate the file + :" + file.getFullName(), ex); + } // Check if we allocated space to the file if ( allocSize > 0 && quotaMgr != null) diff --git a/source/java/org/alfresco/filesys/repo/LegacyFileStateDriver.java b/source/java/org/alfresco/filesys/repo/LegacyFileStateDriver.java index 53193fd796..6614ba731c 100644 --- a/source/java/org/alfresco/filesys/repo/LegacyFileStateDriver.java +++ b/source/java/org/alfresco/filesys/repo/LegacyFileStateDriver.java @@ -289,6 +289,11 @@ public class LegacyFileStateDriver implements ExtendedDiskInterface { ContentContext tctx = (ContentContext) tree.getContext(); + if(logger.isDebugEnabled()) + { + logger.debug("closeFile:" + param.getFullName() + ", accessToken:" + param.getAccessToken()); + } + try { diskInterface.closeFile(sess, tree, param); @@ -300,7 +305,7 @@ public class LegacyFileStateDriver implements ExtendedDiskInterface if(fstate.getOpenCount() ==0 ) { - logger.debug("reset shared access to READWRITEDELETE"); + logger.debug("OpenCount = 0, reset shared access to READ WRITE DELETE"); fstate.setSharedAccess( SharingMode.READWRITE + SharingMode.DELETE); fstate.setAllocationSize(-1); @@ -311,10 +316,11 @@ public class LegacyFileStateDriver implements ExtendedDiskInterface if(fstate != null && param.getAccessToken() != null) { + FileAccessToken token = param.getAccessToken(); if(logger.isDebugEnabled() && token != null) { - logger.debug("close file release lock token:" + token); + logger.debug("close file release access token:" + token); } cache.releaseFileAccess(fstate, token); } diff --git a/source/java/org/alfresco/filesys/repo/NonTransactionalRuleContentDiskDriver.java b/source/java/org/alfresco/filesys/repo/NonTransactionalRuleContentDiskDriver.java index 0d45468337..7285640bba 100644 --- a/source/java/org/alfresco/filesys/repo/NonTransactionalRuleContentDiskDriver.java +++ b/source/java/org/alfresco/filesys/repo/NonTransactionalRuleContentDiskDriver.java @@ -39,6 +39,7 @@ import org.alfresco.filesys.repo.rules.operations.RenameFileOperation; import org.alfresco.jlan.server.SrvSession; import org.alfresco.jlan.server.core.DeviceContext; import org.alfresco.jlan.server.core.DeviceContextException; +import org.alfresco.jlan.server.filesys.FileAction; import org.alfresco.jlan.server.filesys.FileInfo; import org.alfresco.jlan.server.filesys.FileName; import org.alfresco.jlan.server.filesys.FileOpenParams; @@ -308,8 +309,20 @@ public class NonTransactionalRuleContentDiskDriver implements ExtendedDiskInterf + ", isDeleteOnClose:" +param.isDeleteOnClose() + ", allocationSize:" + param.getAllocationSize() + ", sharedAccess: " + strSharedAccess - + + ", openAction: " + param.getOpenAction() ); + + // TODO - If we are going to truncate then don't waste time copying content. + if (param.getOpenAction() == FileAction.NTOverwriteIf) + { + logger.debug("NTOverwriteIf"); + } + if (param.getOpenAction() == FileAction.NTOverwrite) + { + logger.debug("NTOverwrite"); + } + + } ContentContext tctx = (ContentContext) tree.getContext();