Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Samuel Langlois
2013-08-20 17:17:31 +00:00
parent 0a36e2af67
commit ab4ca7177f
1576 changed files with 36419 additions and 8603 deletions

View File

@@ -1033,7 +1033,10 @@ public class TransferServiceImpl2 implements TransferService2
* Step 1: Create a chunker and wire it up to the transmitter
*/
final ContentChunker chunker = new ContentChunkerImpl();
final Long fRange = Long.valueOf(definition.getNodes().size());
final Long removeNodesRange = Long.valueOf(definition.getNodesToRemove() != null ? definition.getNodesToRemove().size() : 0);
final Long nodesRange = Long.valueOf( definition.getNodes() != null ? definition.getNodes().size() : 0);
final Long fRange = removeNodesRange + nodesRange;
chunker.setHandler(
new ContentChunkProcessor(){
private long counter = 0;
@@ -1180,7 +1183,7 @@ public class TransferServiceImpl2 implements TransferService2
this.transmitter = transmitter;
}
// note: cache is tenant-aware (if using EhCacheAdapter shared cache)
// note: cache is tenant-aware (if using TransctionalCache impl)
private SimpleCache<String, NodeRef> singletonCache; // eg. for transferHomeNodeRef
private final String KEY_TRANSFER_HOME_NODEREF = "key.transferServiceImpl2Home.noderef";