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

Merged MNT-17845-5.2.N (5.2.2) to 5.2.N (5.2.2)

Browse Source 
137773 anechifor: REPO-2516 - MNT-17845 : Smart Folders - replece isReference with fromNodeRef


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2017-06-23 11:37:21 +00:00
parent f84a7bf2f3
commit f6f20a31f9
5 changed files with 64 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/java/org/alfresco/repo/virtual/bundle/VirtualCheckOutCheckInServiceExtension.java
View File

@@ -67,10 +67,10 @@ public class VirtualCheckOutCheckInServiceExtension extends
materialDestination,
destinationAssocTypeQName,
destinationAssocQName);
if (Reference.isReference(destinationParentNodeRef))
Reference parentReference = Reference.fromNodeRef(destinationParentNodeRef);
if (parentReference != null)
{
Reference parentReference = Reference.fromNodeRef(destinationParentNodeRef);
Reference workingCopyReference = NodeProtocol.newReference(workingCopy,
parentReference);
return workingCopyReference.toNodeRef(workingCopy.getStoreRef());
@@ -121,10 +121,10 @@ public class VirtualCheckOutCheckInServiceExtension extends
}
private NodeRef virtualizeOriginalIfNeeded(NodeRef workingCopyNodeRef, NodeRef materialOriginalNode)
{
if (materialOriginalNode != null && Reference.isReference(workingCopyNodeRef))
{
Reference workingCopyReference = Reference.fromNodeRef(workingCopyNodeRef);
if ((materialOriginalNode != null) && (workingCopyReference != null))
{
Reference workingCopyReference = Reference.fromNodeRef(workingCopyNodeRef);
Reference parentReference = workingCopyReference.execute(new GetParentReferenceMethod());
Reference originalReference = NodeProtocol.newReference(materialOriginalNode,
parentReference);
@@ -168,11 +168,11 @@ public class VirtualCheckOutCheckInServiceExtension extends
}
private NodeRef virtualizeVersionIfNeeded(NodeRef originalNodeRef, NodeRef materialVersion)
{
if (materialVersion != null && Reference.isReference(originalNodeRef)
&& !Reference.isReference(materialVersion))
{
Reference reference = Reference.fromNodeRef(originalNodeRef);
if ((materialVersion != null) && (reference != null)
&& (Reference.fromNodeRef(materialVersion)==null))
{
Reference reference = Reference.fromNodeRef(originalNodeRef);
Reference parentReference = reference.execute(new GetParentReferenceMethod());
Reference workingCopyReference = NodeProtocol.newReference(materialVersion,
parentReference);