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

DM-DM tidying:

Browse Source 
- Added NodeCrawlerFactory interface and standard implementation
 - Removed test actions from the context files
 - ensure that the temporary store node is deleted when the transfer ends
 - Added missing error messages from the transfer properties file
 - Inserted abstract NodeFinder and NodeFilter to clean those interfaces up a little

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19213 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Brian Remmington
2010-03-11 10:36:19 +00:00
parent f2b334b68a
commit 84b6373ddb
32 changed files with 442 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
source/java/org/alfresco/repo/transfer/RepoTransferReceiverImpl.java
View File

@@ -372,7 +372,7 @@ public class RepoTransferReceiverImpl implements TransferReceiver
}
if (transferId == null)
{
throw new IllegalArgumentException("transferId = " + transferId);
throw new IllegalArgumentException("transferId = null");
}
try
@@ -392,13 +392,27 @@ public class RepoTransferReceiverImpl implements TransferReceiver
throw new TransferException(MSG_NOT_LOCK_OWNER, new Object[] { transferId });
}
// Delete the lock node.
log.debug("delete lock node :" + lockId);
log.debug("Deleting lock node :" + lockId);
nodeService.deleteNode(lockId);
log.debug("lock deleted :" + lockId);
log.debug("Lock deleted :" + lockId);
}
return null;
}
}, false, true);
NodeRef tempStoreNode = null;
try
{
log.debug("Deleting temporary store node...");
tempStoreNode = getTempFolder(transferId);
nodeService.deleteNode(tempStoreNode);
log.debug("Deleted temporary store node.");
}
catch (Exception ex)
{
log.warn("Failed to delete temp store node for transfer id " + transferId + "\nTemp store noderef = " + tempStoreNode);
}
log.debug("delete staging folder " + transferId);
// Delete the staging folder.
File stagingFolder = getStagingFolder(transferId);
@@ -411,7 +425,7 @@ public class RepoTransferReceiverImpl implements TransferReceiver
}
catch (Exception ex)
{
throw new TransferException(MSG_ERROR_WHILE_ENDING_TRANSFER, ex);
throw new TransferException(MSG_ERROR_WHILE_ENDING_TRANSFER, new Object[] {transferId}, ex);
}
}
@@ -529,7 +543,7 @@ public class RepoTransferReceiverImpl implements TransferReceiver
}
catch (Exception ex)
{
throw new TransferException(MSG_ERROR_WHILE_STAGING_SNAPSHOT, ex);
throw new TransferException(MSG_ERROR_WHILE_STAGING_SNAPSHOT, new Object[]{transferId}, ex);
}
}
@@ -553,7 +567,7 @@ public class RepoTransferReceiverImpl implements TransferReceiver
}
catch (Exception ex)
{
throw new TransferException(MSG_ERROR_WHILE_STAGING_CONTENT, ex);
throw new TransferException(MSG_ERROR_WHILE_STAGING_CONTENT, new Object[]{transferId, contentFileId}, ex);
}
}
@@ -622,7 +636,7 @@ public class RepoTransferReceiverImpl implements TransferReceiver
else
{
progressMonitor.log(transferId, "Unable to start commit. No snapshot file received",
new TransferException(MSG_NO_SNAPSHOT_RECEIVED));
new TransferException(MSG_NO_SNAPSHOT_RECEIVED, new Object[]{transferId}));
}
return null;
}
@@ -639,7 +653,7 @@ public class RepoTransferReceiverImpl implements TransferReceiver
}
else
{
throw new TransferException(MSG_ERROR_WHILE_COMMITTING_TRANSFER, error);
throw new TransferException(MSG_ERROR_WHILE_COMMITTING_TRANSFER, new Object[]{transferId}, error);
}
}
@@ -669,9 +683,7 @@ public class RepoTransferReceiverImpl implements TransferReceiver
*/
try
{
log.debug("calling end");
end(transferId);
log.debug("called end");
}
catch (Exception ex)
{