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

Fix for asynchronous action test. Authentication context was not set for complete asynchronous action execution transaction, therefore failed in commit processing.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2355 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2006-02-13 12:40:31 +00:00
parent ae6bed1eb4
commit 056a3dc9d8
2 changed files with 42 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
source/java/org/alfresco/repo/action/ActionServiceImplTest.java
View File

@@ -673,18 +673,18 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
final NodeService finalNodeService = this.nodeService; final NodeService finalNodeService = this.nodeService;
final NodeRef finalNodeRef = this.nodeRef; final NodeRef finalNodeRef = this.nodeRef;
// postAsyncActionTest( postAsyncActionTest(
// this.transactionService, this.transactionService,
// 100000000, 1000,
// 10, 10,
// new AsyncTest() new AsyncTest()
// { {
// public boolean executeTest() public boolean executeTest()
// { {
// return ( return (
// finalNodeService.hasAspect(finalNodeRef, ContentModel.ASPECT_VERSIONABLE)); finalNodeService.hasAspect(finalNodeRef, ContentModel.ASPECT_VERSIONABLE));
// }; };
// }); });
} }
@@ -715,19 +715,19 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
final NodeService finalNodeService = this.nodeService; final NodeService finalNodeService = this.nodeService;
final NodeRef finalNodeRef = this.nodeRef; final NodeRef finalNodeRef = this.nodeRef;
// postAsyncActionTest( postAsyncActionTest(
// this.transactionService, this.transactionService,
// 1000, 1000,
// 10, 10,
// new AsyncTest() new AsyncTest()
// { {
// public boolean executeTest() public boolean executeTest()
// { {
// return ( return (
// finalNodeService.hasAspect(finalNodeRef, ContentModel.ASPECT_VERSIONABLE) && finalNodeService.hasAspect(finalNodeRef, ContentModel.ASPECT_VERSIONABLE) &&
// finalNodeService.hasAspect(finalNodeRef, ContentModel.ASPECT_LOCKABLE)); finalNodeService.hasAspect(finalNodeRef, ContentModel.ASPECT_LOCKABLE));
// }; };
// }); });
} }
public void xtestAsyncLoadTest() public void xtestAsyncLoadTest()

37
source/java/org/alfresco/repo/action/AsynchronousActionExecutionQueueImpl.java
View File

@@ -28,8 +28,6 @@ import org.alfresco.service.cmr.action.ActionServiceException;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.transaction.TransactionService; import org.alfresco.service.transaction.TransactionService;
import freemarker.log.Logger;
/** /**
* The asynchronous action execution queue implementation * The asynchronous action execution queue implementation
* *
@@ -271,30 +269,29 @@ public class AsynchronousActionExecutionQueueImpl extends ThreadPoolExecutor imp
throw new ActionServiceException("Cannot execute action asynchronously since run as user is 'null'"); throw new ActionServiceException("Cannot execute action asynchronously since run as user is 'null'");
} }
TransactionUtil.executeInNonPropagatingUserTransaction(this.transactionService, ActionExecutionWrapper.this.authenticationComponent.setCurrentUser(userName);
new TransactionUtil.TransactionWork()
{ try
public Object doWork() {
{ TransactionUtil.executeInNonPropagatingUserTransaction(this.transactionService,
ActionExecutionWrapper.this.authenticationComponent new TransactionUtil.TransactionWork()
.setCurrentUser(userName); {
public Object doWork()
try {
{
ActionExecutionWrapper.this.actionService.executeActionImpl( ActionExecutionWrapper.this.actionService.executeActionImpl(
ActionExecutionWrapper.this.action, ActionExecutionWrapper.this.action,
ActionExecutionWrapper.this.actionedUponNodeRef, ActionExecutionWrapper.this.actionedUponNodeRef,
ActionExecutionWrapper.this.checkConditions, true, ActionExecutionWrapper.this.checkConditions, true,
ActionExecutionWrapper.this.actionChain); ActionExecutionWrapper.this.actionChain);
return null;
} }
finally });
{ }
ActionExecutionWrapper.this.authenticationComponent.clearCurrentSecurityContext(); finally
} {
ActionExecutionWrapper.this.authenticationComponent.clearCurrentSecurityContext();
return null; }
}
});
} }
catch (Throwable exception) catch (Throwable exception)
{ {