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

ALF-4800 - add some info logging to show AVM conflicts

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22807 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2010-10-01 11:37:15 +00:00
parent b6bd5f427c
commit 64389fa1bb
1 changed files with 68 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -774,6 +774,10 @@ public class AVMSyncServiceImpl implements AVMSyncService
if ((srcDesc.isDirectory() && dstDesc.isFile()) ||
(srcDesc.isFile() && dstDesc.isDirectory()))
{
if (logger.isInfoEnabled())
{
logger.info("compareOne(1): conflict ["+srcDesc+","+dstDesc+"]");
}
return AVMDifference.CONFLICT;
}
@@ -784,6 +788,10 @@ public class AVMSyncServiceImpl implements AVMSyncService
AVMNodeDescriptor common = fAVMService.getCommonAncestor(srcDesc, dstDesc);
if (common == null)
{
if (logger.isInfoEnabled())
{
logger.info("compareOne(2): conflict ["+srcDesc+","+dstDesc+"]");
}
return AVMDifference.CONFLICT;
}
if (common.getId() == srcDesc.getId())
@@ -822,6 +830,10 @@ public class AVMSyncServiceImpl implements AVMSyncService
}
// Must be a conflict.
if (logger.isInfoEnabled())
{
logger.info("compareOne(3): conflict ["+srcDesc+","+dstDesc+"]");
}
return AVMDifference.CONFLICT;
}
@@ -852,6 +864,11 @@ public class AVMSyncServiceImpl implements AVMSyncService
{
return dirDiffCode;
}
if (logger.isInfoEnabled())
{
logger.info("compareOne(4): conflict ["+srcDesc+","+dstDesc+"]");
}
}
// drop through to check common ancestor
@@ -862,6 +879,10 @@ public class AVMSyncServiceImpl implements AVMSyncService
// Conflict case.
if (common == null)
{
if (logger.isInfoEnabled())
{
logger.info("compareOne(5): conflict ["+srcDesc+","+dstDesc+"]");
}
return AVMDifference.CONFLICT;
}
if (common.getId() == srcDesc.getId())
@@ -872,6 +893,11 @@ public class AVMSyncServiceImpl implements AVMSyncService
{
return AVMDifference.NEWER;
}
if (logger.isInfoEnabled())
{
logger.info("compareOne(6): conflict ["+srcDesc+","+dstDesc+"]");
}
// They must, finally, be in conflict.
return AVMDifference.CONFLICT;
}
@@ -888,6 +914,11 @@ public class AVMSyncServiceImpl implements AVMSyncService
{
return AVMDifference.SAME;
}
if (logger.isInfoEnabled())
{
logger.info("compareOne(7): conflict ["+srcDesc+","+dstDesc+"]");
}
// We know that they are in conflict since they are of different types.
return AVMDifference.CONFLICT;
}
@@ -895,6 +926,10 @@ public class AVMSyncServiceImpl implements AVMSyncService
AVMNodeDescriptor common = fAVMService.getCommonAncestor(srcDesc, dstDesc);
if (common == null)
{
if (logger.isInfoEnabled())
{
logger.info("compareOne(8): conflict ["+srcDesc+","+dstDesc+"]");
}
return AVMDifference.CONFLICT;
}
if (common.getId() == srcDesc.getId())
@@ -905,6 +940,10 @@ public class AVMSyncServiceImpl implements AVMSyncService
{
return AVMDifference.NEWER;
}
if (logger.isInfoEnabled())
{
logger.info("compareOne(9): conflict ["+srcDesc+","+dstDesc+"]");
}
// Finally we know they are in conflict.
return AVMDifference.CONFLICT;
}
@@ -921,6 +960,10 @@ public class AVMSyncServiceImpl implements AVMSyncService
AVMNodeDescriptor common = fAVMService.getCommonAncestor(srcDesc, dstDesc);
if (common == null)
{
if (logger.isInfoEnabled())
{
logger.info("compareOne(10): conflict ["+srcDesc+","+dstDesc+"]");
}
return AVMDifference.CONFLICT;
}
if (common.getId() == srcDesc.getId())
@@ -941,6 +984,10 @@ public class AVMSyncServiceImpl implements AVMSyncService
}
}
if (logger.isInfoEnabled())
{
logger.info("compareOne(11): conflict ["+srcDesc+","+dstDesc+"]");
}
return AVMDifference.CONFLICT;
}
// Destination is a plain file.
@@ -949,6 +996,10 @@ public class AVMSyncServiceImpl implements AVMSyncService
// Conflict case.
if (common == null)
{
if (logger.isInfoEnabled())
{
logger.info("compareOne(12): conflict ["+srcDesc+","+dstDesc+"]");
}
return AVMDifference.CONFLICT;
}
if (common.getId() == srcDesc.getId())
@@ -969,6 +1020,10 @@ public class AVMSyncServiceImpl implements AVMSyncService
}
}
if (logger.isInfoEnabled())
{
logger.info("compareOne(13): conflict ["+srcDesc+","+dstDesc+"]");
}
// They must, finally, be in conflict.
return AVMDifference.CONFLICT;
}
@@ -1032,6 +1087,10 @@ public class AVMSyncServiceImpl implements AVMSyncService
}
else
{
if (logger.isInfoEnabled())
{
logger.info("compareNodeProps(1): conflict ["+srcDesc+","+dstDesc+"]");
}
return AVMDifference.CONFLICT;
}
}
@@ -1039,6 +1098,10 @@ public class AVMSyncServiceImpl implements AVMSyncService
return AVMDifference.SAME;
}
if (logger.isInfoEnabled())
{
logger.info("compareNodeProps(2): conflict ["+srcDesc+","+dstDesc+"]");
}
return AVMDifference.CONFLICT;
}
@@ -1116,6 +1179,11 @@ public class AVMSyncServiceImpl implements AVMSyncService
}
}
if (logger.isInfoEnabled())
{
logger.info("compareACLs: conflict ["+srcDesc+","+dstDesc+"]");
}
return AVMDifference.CONFLICT;
}