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

CMIS deleteObject(false) bug fix

Browse Source 
(related to ALF-6791)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31315 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Florian Mü
2011-10-18 13:32:32 +00:00
parent 2a5a337b4e
commit 4b45b83463
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/java/org/alfresco/opencmis/AlfrescoCmisService.java
View File

@@ -1747,7 +1747,22 @@ public class AlfrescoCmisService extends AbstractCmisService
} }
// attempt to delete the node // attempt to delete the node
connector.getNodeService().deleteNode(nodeRef); if (allVersions)
{
connector.getNodeService().deleteNode(nodeRef);
} else
{
CMISNodeInfoImpl infoImpl = ((CMISNodeInfoImpl) info);
Version version = infoImpl.getVersion();
if (infoImpl.getVersionHistory().getPredecessor(version) == null)
{
connector.getNodeService().deleteNode(nodeRef);
} else
{
connector.getVersionService().deleteVersion(nodeRef, version);
}
}
return true; return true;
} catch (AccessDeniedException ade) } catch (AccessDeniedException ade)
{ {
@@ -2007,7 +2022,7 @@ public class AlfrescoCmisService extends AbstractCmisService
NodeRef pwcNodeRef = connector.getCheckOutCheckInService().checkout(nodeRef); NodeRef pwcNodeRef = connector.getCheckOutCheckInService().checkout(nodeRef);
CMISNodeInfo pwcNodeInfo = createNodeInfo(pwcNodeRef); CMISNodeInfo pwcNodeInfo = createNodeInfo(pwcNodeRef);
objectId.setValue(pwcNodeInfo.getObjectId()); objectId.setValue(pwcNodeInfo.getObjectId());
if (contentCopied != null) if (contentCopied != null)
{ {
contentCopied.setValue(connector.getFileFolderService().getReader(pwcNodeRef) != null); contentCopied.setValue(connector.getFileFolderService().getReader(pwcNodeRef) != null);