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

Bug fix for case where commit failed.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@23127 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2010-10-15 08:41:09 +00:00
parent 7d543fe05f
commit 968933de37
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/java/org/alfresco/repo/transfer/TransferServiceImpl2.java
View File

@@ -631,8 +631,10 @@ public class TransferServiceImpl2 implements TransferService2
case Commit: case Commit:
{ {
logger.debug("about to start committing transferId:" + transfer.getTransferId());
eventProcessor.commit(); eventProcessor.commit();
transmitter.commit(transfer); transmitter.commit(transfer);
logger.debug("committing transferId:" + transfer.getTransferId()); logger.debug("committing transferId:" + transfer.getTransferId());
checkCancel(transfer.getTransferId()); checkCancel(transfer.getTransferId());
@@ -828,9 +830,17 @@ public class TransferServiceImpl2 implements TransferService2
catch(Exception e) catch(Exception e)
{ {
logger.debug("Exception - unable to transfer", e); logger.debug("Exception - unable to transfer", e);
failureException = e;
if (transfer != null && (clientState == ClientTransferState.Begin || clientState == ClientTransferState.Prepare)) /**
* Save the first exception that we encounter.
*/
if(failureException == null)
{
failureException = e;
}
if (transfer != null && (clientState == ClientTransferState.Begin ||
clientState == ClientTransferState.Prepare ||
clientState == ClientTransferState.Commit))
{ {
// we must first inform the target repository that a client failure has occurred to allow it to // we must first inform the target repository that a client failure has occurred to allow it to
// clean up appropriately, too // clean up appropriately, too