Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

102712: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      102493: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         102367: Merged DEV to V4.2-BUG-FIX (4.2.5).
            101783: MNT-13625: Not all users receive notification emails.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@103542 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-05-02 07:18:49 +00:00
parent 69e180c4dc
commit f38566ccf1
2 changed files with 20 additions and 1 deletions

View File

@@ -346,12 +346,13 @@ public class FeedNotifierImpl implements FeedNotifier, ApplicationContextAware
public void beforeProcess() throws Throwable public void beforeProcess() throws Throwable
{ {
AuthenticationUtil.pushAuthentication();
AuthenticationUtil.setFullyAuthenticatedUser(currentUser); AuthenticationUtil.setFullyAuthenticatedUser(currentUser);
} }
public void afterProcess() throws Throwable public void afterProcess() throws Throwable
{ {
AuthenticationUtil.clearCurrentSecurityContext(); AuthenticationUtil.popAuthentication();
} }
public void process(final PersonInfo person) throws Throwable public void process(final PersonInfo person) throws Throwable

View File

@@ -249,6 +249,24 @@ public class FeedNotifierTest
} }
} }
/**
* MNT-13625 test
*/
@Test
public void testNumThread() throws Exception
{
AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getSystemUserName());
generateActivities();
// set activities.feedNotifier.numThreads property to 1
feedNotifier.setNumThreads(1);
feedNotifier.execute(1);
assertTrue(errorProneActionExecutor.getNumSuccess() > 0);
// set activities.feedNotifier.numThreads property to 4
feedNotifier.setNumThreads(4);
feedNotifier.execute(1);
assertTrue(errorProneActionExecutor.getNumSuccess() > 0);
}
/** /**
* ALF-16155 test * ALF-16155 test
*/ */