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

Merged V3.1 to HEAD

Browse Source 
13175: Basic implementation of timestamp propagation
   13176: Fixed ETHREEOH-1172: NodeService.getProperties sometimes returning instance of "Collections.SingletonList"
   13184: Merged V3.0 to V3.1
      13179: Merged V2.2 to V3.0
         13141: Fix for ETWOTWO-1109: WCM - content publisher cannot submit modified assets (2.2.3-dev regress)
         13144: Fix for repopened ETWOTWO-1082:  AVM has concurrency limitations via CIFS/NFS/FTP ...
      13180: Merged V2.2 to V3.0
         13144: Fix for repopened ETWOTWO-1082:  AVM has concurrency limitations via CIFS/NFS/FTP ...
   13185: Logging enhancements to FileFolderService to aid debugging of ETHREEOH-1247
   13187: Changed NPE to IllegalArgumentException
   13191: Fix for ETHREEOH-1267 malformed JSON.
   13203: Fix ETHREEOH-1309 regress
   13205: Fixed typo of UNKNOWN
   13206: DM index check - allow index transaction tracker to be reset, etc
   13213: Fixed ETHREEOH-1313: System Property Overrides not working when using the installer
   13214: WCM services - add/update unit tests - CRUD using different roles
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V3.0:r13179-13180
      Merged /alfresco/BRANCHES/V2.2:r13141,13144
      Merged /alfresco/BRANCHES/V3.1:r13172,13175-13176,13179-13181,13184-13189,13191,13203,13205-13206,13210-13215


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13610 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2009-03-12 20:15:34 +00:00
parent 39bc2536d5
commit 07114a1ed2
21 changed files with 736 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1732,7 +1732,7 @@ public class ContentDiskDriver extends AlfrescoDiskDriver implements DiskInterfa
// Get the node for the folder
NodeRef nodeRef = cifsHelper.getNodeRef(deviceRootNodeRef, dir);
if (nodeService.exists(nodeRef))
if (fileFolderService.exists(nodeRef))
{
// Check if the folder is empty
@@ -1740,7 +1740,7 @@ public class ContentDiskDriver extends AlfrescoDiskDriver implements DiskInterfa
// Delete the folder node
nodeService.deleteNode(nodeRef);
fileFolderService.delete(nodeRef);
// Remove the file state
@@ -1849,13 +1849,13 @@ public class ContentDiskDriver extends AlfrescoDiskDriver implements DiskInterfa
// We don't know how long the network file has had the reference, so check for existence
if (nodeService.exists(nodeRef))
if (fileFolderService.exists(nodeRef))
{
try
{
// Delete the file
nodeService.deleteNode(nodeRef);
fileFolderService.delete(nodeRef);
// Remove the file state
@@ -1866,9 +1866,6 @@ public class ContentDiskDriver extends AlfrescoDiskDriver implements DiskInterfa
// sess.endTransaction();
// beginReadTransaction( sess);
if ( nodeService.exists( nodeRef))
System.out.println("Node still exists - " + file.getFullName());
}
catch (org.alfresco.repo.security.permissions.AccessDeniedException ex)
{
@@ -1930,9 +1927,9 @@ public class ContentDiskDriver extends AlfrescoDiskDriver implements DiskInterfa
// Get the node
NodeRef nodeRef = getNodeForPath(tree, name);
if (nodeService.exists(nodeRef))
if (fileFolderService.exists(nodeRef))
{
nodeService.deleteNode(nodeRef);
fileFolderService.delete(nodeRef);
// Remove the file state
@@ -2551,7 +2548,7 @@ public class ContentDiskDriver extends AlfrescoDiskDriver implements DiskInterfa
{
// Check that the node exists
if (nodeService.exists(fstate.getNodeRef()))
if (fileFolderService.exists(fstate.getNodeRef()))
{
// Bump the file states expiry time