Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

103947: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      103926: Merged NESS/5.0.N-2015_03_23 (5.0.2) to 5.0.N (5.0.2)
         103902: MNT-13205 - hide the cancel exception from the log, small refactoring of the exception logging


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104034 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tatyana Valkevych
2015-05-12 15:32:40 +00:00
parent 04916eb008
commit dee9fdcf00
7 changed files with 80 additions and 13 deletions

View File

@@ -370,6 +370,17 @@ public class ReplicationActionExecutor extends ActionExecuterAbstractBase {
}
}
@Override
public boolean onLogException(Log logger, Throwable t, String message)
{
if(t instanceof ActionCancelledException)
{
logger.debug(message);
return true;
}
return false;
}
/**
* A {@link TransferCallback} which periodically renews the
* lock held against a {@link ReplicationDefinition}