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

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 2c4637723f
commit 0d8df71921
5 changed files with 165 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
source/java/org/alfresco/repo/webservice/administration/AdministrationWebService.java
View File

@@ -36,8 +36,7 @@ import java.util.Set;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.cache.SimpleCache;
import org.alfresco.repo.transaction.TransactionUtil;
import org.alfresco.repo.transaction.TransactionUtil.TransactionWork;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.repo.webservice.AbstractWebService;
import org.alfresco.repo.webservice.Utils;
import org.alfresco.repo.webservice.action.ActionFault;
@@ -138,13 +137,14 @@ public class AdministrationWebService extends AbstractWebService implements
{
try
{
return TransactionUtil.executeInUserTransaction(this.transactionService, new TransactionWork<UserQueryResults>()
RetryingTransactionCallback<UserQueryResults> callback = new RetryingTransactionCallback<UserQueryResults>()
{
public UserQueryResults doWork() throws Exception
public UserQueryResults execute() throws Exception
{
return queryUsersImpl(filter);
}
});
};
return transactionService.getRetryingTransactionHelper().doInTransaction(callback);
}
catch (Throwable exception)
{
@@ -189,13 +189,14 @@ public class AdministrationWebService extends AbstractWebService implements
{
try
{
return TransactionUtil.executeInUserTransaction(this.transactionService, new TransactionWork<UserQueryResults>()
RetryingTransactionCallback<UserQueryResults> callback = new RetryingTransactionCallback<UserQueryResults>()
{
public UserQueryResults doWork() throws Exception
public UserQueryResults execute() throws Exception
{
return fetchMoreUsersImpl(querySession);
}
});
};
return transactionService.getRetryingTransactionHelper().doInTransaction(callback);
}
catch (Throwable exception)
{
@@ -237,13 +238,14 @@ public class AdministrationWebService extends AbstractWebService implements
{
try
{
return TransactionUtil.executeInUserTransaction(this.transactionService, new TransactionWork<UserDetails>()
RetryingTransactionCallback<UserDetails> callback = new RetryingTransactionCallback<UserDetails>()
{
public UserDetails doWork() throws Exception
public UserDetails execute() throws Exception
{
return getUserImpl(userName);
}
});
};
return transactionService.getRetryingTransactionHelper().doInTransaction(callback);
}
catch (Throwable exception)
{
@@ -331,13 +333,14 @@ public class AdministrationWebService extends AbstractWebService implements
{
try
{
return TransactionUtil.executeInUserTransaction(this.transactionService, new TransactionWork<UserDetails[]>()
RetryingTransactionCallback<UserDetails[]> callback = new RetryingTransactionCallback<UserDetails[]>()
{
public UserDetails[] doWork() throws Exception
public UserDetails[] execute() throws Exception
{
return createUsersImpl(newUsers);
}
});
};
return transactionService.getRetryingTransactionHelper().doInTransaction(callback);
}
catch (Throwable exception)
{
@@ -392,13 +395,14 @@ public class AdministrationWebService extends AbstractWebService implements
{
try
{
return TransactionUtil.executeInUserTransaction(this.transactionService, new TransactionWork<UserDetails[]>()
RetryingTransactionCallback<UserDetails[]> callback = new RetryingTransactionCallback<UserDetails[]>()
{
public UserDetails[] doWork() throws Exception
public UserDetails[] execute() throws Exception
{
return updateUsersImpl(users);
}
});
};
return transactionService.getRetryingTransactionHelper().doInTransaction(callback);
}
catch (Throwable exception)
{
@@ -451,14 +455,15 @@ public class AdministrationWebService extends AbstractWebService implements
{
try
{
TransactionUtil.executeInUserTransaction(this.transactionService, new TransactionWork<Object>()
RetryingTransactionCallback<Object> callback = new RetryingTransactionCallback<Object>()
{
public Object doWork() throws Exception
public Object execute() throws Exception
{
changePasswordImpl(userName, oldPassword, newPassword);
return null;
}
});
};
transactionService.getRetryingTransactionHelper().doInTransaction(callback);
}
catch (Throwable exception)
{
@@ -499,14 +504,15 @@ public class AdministrationWebService extends AbstractWebService implements
{
try
{
TransactionUtil.executeInUserTransaction(this.transactionService, new TransactionWork<Object>()
RetryingTransactionCallback<Object> callback = new RetryingTransactionCallback<Object>()
{
public Object doWork() throws Exception
public Object execute() throws Exception
{
deleteUsersImpl(userNames);
return null;
}
});
};
transactionService.getRetryingTransactionHelper().doInTransaction(callback);
}
catch (Throwable exception)
{