inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-06-09 17:45:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

This allows missing nodes to override existing nodes during an update. It

Browse Source 
should allow reverts to work correctly in all circumstances.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4429 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park 2006-11-22 19:10:17 +00:00
parent d12551d5cc
commit a5bd362e24
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/java/org/alfresco/repo/avm/AVMSyncServiceImpl.java
View File

@ -317,10 +317,10 @@ public class AVMSyncServiceImpl implements AVMSyncService
} }
AVMNodeDescriptor srcDesc = fAVMService.lookup(version, AVMNodeDescriptor srcDesc = fAVMService.lookup(version,
diff.getSourcePath(), true); diff.getSourcePath(), true);
if (srcDesc == null) // if (srcDesc == null)
{ // {
throw new AVMSyncException("Source node not found: " + diff.getSourcePath()); // throw new AVMSyncException("Source node not found: " + diff.getSourcePath());
} // }
String [] dstParts = AVMNodeConverter.SplitBase(diff.getDestinationPath()); String [] dstParts = AVMNodeConverter.SplitBase(diff.getDestinationPath());
if (dstParts[0] == null || diff.getDestinationVersion() >= 0) if (dstParts[0] == null || diff.getDestinationVersion() >= 0)
{ {
@ -416,6 +416,12 @@ public class AVMSyncServiceImpl implements AVMSyncService
*/ */
private void linkIn(String parentPath, String name, AVMNodeDescriptor toLink, boolean removeFirst) private void linkIn(String parentPath, String name, AVMNodeDescriptor toLink, boolean removeFirst)
{ {
// This is a delete.
if (toLink == null)
{
fAVMService.removeNode(parentPath, name);
return;
}
mkdirs(parentPath, AVMNodeConverter.SplitBase(toLink.getPath())[0]); mkdirs(parentPath, AVMNodeConverter.SplitBase(toLink.getPath())[0]);
if (removeFirst) if (removeFirst)
{ {
@ -484,6 +490,10 @@ public class AVMSyncServiceImpl implements AVMSyncService
*/ */
private int compareOne(AVMNodeDescriptor srcDesc, AVMNodeDescriptor dstDesc) private int compareOne(AVMNodeDescriptor srcDesc, AVMNodeDescriptor dstDesc)
{ {
if (srcDesc == null)
{
return AVMDifference.OLDER;
}
if (srcDesc.getId() == dstDesc.getId()) if (srcDesc.getId() == dstDesc.getId())
{ {
return AVMDifference.SAME; return AVMDifference.SAME;