inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

More for AR-460: System concurrency

Browse Source 
There might be a few SDK projects that still use TransactionUtil, but this checkin gets rid of
its use otherwise.
I took a glance over the areas of the code that use UserTransaction directly and didn't see any
transactionally wrapped code that desperately needed to be put into a retry loop (i.e. write
transactions in a concurrent scenario).  If you spot any that you think might qualify, let me know.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6220 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-07-12 04:15:28 +00:00
parent 32054c773c
commit 0d1bd57217
31 changed files with 230 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
source/java/org/alfresco/repo/importer/FileImporterImpl.java
View File

@@ -35,8 +35,8 @@ import java.util.Map;
import org.alfresco.model.ApplicationModel;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.transaction.TransactionUtil;
import org.alfresco.repo.transaction.TransactionUtil.TransactionWork;
import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.ContentData;
@@ -170,25 +170,26 @@ public class FileImporterImpl implements FileImporter
boolean recurse,
final String containerName) throws Throwable
{
RetryingTransactionHelper txnHelper = transactionService.getRetryingTransactionHelper();
if (containerName != null)
{
TransactionWork<NodeRef> createDirectoryWork = new TransactionWork<NodeRef>()
RetryingTransactionCallback<NodeRef> createDirectoryWork = new RetryingTransactionCallback<NodeRef>()
{
public NodeRef doWork() throws Exception
public NodeRef execute() throws Exception
{
return createDirectory(container, containerName, containerName);
}
};
NodeRef newContainer = TransactionUtil.executeInUserTransaction(transactionService, createDirectoryWork);
NodeRef newContainer = txnHelper.doInTransaction(createDirectoryWork);
return create(counter, newContainer, file, filter, recurse, null);
}
if (file.isDirectory())
{
counter.increment();
TransactionWork<NodeRef> createDirectoryWork = new TransactionWork<NodeRef>()
RetryingTransactionCallback<NodeRef> createDirectoryWork = new RetryingTransactionCallback<NodeRef>()
{
public NodeRef doWork() throws Exception
public NodeRef execute() throws Exception
{
return createDirectory(container, file);
}
@@ -196,13 +197,11 @@ public class FileImporterImpl implements FileImporter
NodeRef directoryNodeRef = null;
if (txnPerFile)
{
directoryNodeRef = TransactionUtil.executeInUserTransaction(
transactionService,
createDirectoryWork);
directoryNodeRef = txnHelper.doInTransaction(createDirectoryWork);
}
else
{
directoryNodeRef = createDirectoryWork.doWork();
directoryNodeRef = createDirectoryWork.execute();
}
if (recurse)
@@ -219,9 +218,9 @@ public class FileImporterImpl implements FileImporter
else
{
counter.increment();
TransactionWork<NodeRef> createFileWork = new TransactionWork<NodeRef>()
RetryingTransactionCallback<NodeRef> createFileWork = new RetryingTransactionCallback<NodeRef>()
{
public NodeRef doWork() throws Exception
public NodeRef execute() throws Exception
{
return createFile(container, file);
}
@@ -229,13 +228,11 @@ public class FileImporterImpl implements FileImporter
NodeRef fileNodeRef = null;
if (txnPerFile)
{
fileNodeRef = TransactionUtil.executeInUserTransaction(
transactionService,
createFileWork);
fileNodeRef = txnHelper.doInTransaction(createFileWork);
}
else
{
fileNodeRef = createFileWork.doWork();
fileNodeRef = createFileWork.execute();
}
return fileNodeRef;
}