Merged HEAD (5.1) to 5.1.N (5.1.1)

118256 sdinuta: ACE-4699: Document preview is changed to the physical location after "Edit Offline \ Cancel Editing" action


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118350 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Natalia Smintanca
2015-11-23 11:31:38 +00:00
parent 0423d808db
commit efb26c99dc
2 changed files with 16 additions and 1 deletions

View File

@@ -144,7 +144,10 @@ public class VirtualCheckOutCheckInServiceExtension extends
@Override
public NodeRef cancelCheckout(NodeRef workingCopyNodeRef)
{
return getTrait().cancelCheckout(virtualStore.materializeIfPossible(workingCopyNodeRef));
NodeRef materialOriginalNode = getTrait().cancelCheckout(virtualStore.materializeIfPossible(workingCopyNodeRef));
return virtualizeOriginalIfNeeded(workingCopyNodeRef,
materialOriginalNode);
}
@Override