From b9034085db7f1f77ae05fec64a8de02caec4ac8f Mon Sep 17 00:00:00 2001 From: Dave Ward Date: Thu, 3 Nov 2011 10:47:23 +0000 Subject: [PATCH] Merged V3.4-BUG-FIX to HEAD 31676: ALF-8906: Fix IMAP unit test failures git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31677 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/repo/imap/ImapMessageTest.java | 2 +- source/java/org/alfresco/repo/imap/ImapServiceImpl.java | 6 +++--- .../org/alfresco/repo/imap/ImapServiceImplCacheTest.java | 2 +- source/java/org/alfresco/repo/imap/ImapServiceImplTest.java | 2 +- source/java/org/alfresco/repo/imap/LoadTester.java | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/source/java/org/alfresco/repo/imap/ImapMessageTest.java b/source/java/org/alfresco/repo/imap/ImapMessageTest.java index 813cb809b4..b6f2404552 100644 --- a/source/java/org/alfresco/repo/imap/ImapMessageTest.java +++ b/source/java/org/alfresco/repo/imap/ImapMessageTest.java @@ -205,7 +205,7 @@ public class ImapMessageTest extends TestCase // Starting IMAP - imapServiceImpl.startupInTxn(); + imapServiceImpl.startupInTxn(true); nodeRefs = searchService.selectNodes(storeRootNodeRef, companyHomePathInStore + "/" + NamespaceService.CONTENT_MODEL_PREFIX + ":" + IMAP_FOLDER_NAME, null, namespaceService, false); diff --git a/source/java/org/alfresco/repo/imap/ImapServiceImpl.java b/source/java/org/alfresco/repo/imap/ImapServiceImpl.java index 982ebe38f4..202e9dcfe8 100644 --- a/source/java/org/alfresco/repo/imap/ImapServiceImpl.java +++ b/source/java/org/alfresco/repo/imap/ImapServiceImpl.java @@ -204,7 +204,7 @@ public class ImapServiceImpl implements ImapService, OnCreateChildAssociationPol @Override protected void onBootstrap(ApplicationEvent event) { - service.startupInTxn(); + service.startupInTxn(false); } @Override @@ -431,9 +431,9 @@ public class ImapServiceImpl implements ImapService, OnCreateChildAssociationPol { } - protected void startupInTxn() + protected void startupInTxn(boolean force) { - if (getImapServerEnabled()) + if (force || getImapServerEnabled()) { AuthenticationUtil.runAs(new RunAsWork() { diff --git a/source/java/org/alfresco/repo/imap/ImapServiceImplCacheTest.java b/source/java/org/alfresco/repo/imap/ImapServiceImplCacheTest.java index fada432d22..7d5c300343 100644 --- a/source/java/org/alfresco/repo/imap/ImapServiceImplCacheTest.java +++ b/source/java/org/alfresco/repo/imap/ImapServiceImplCacheTest.java @@ -98,7 +98,7 @@ public class ImapServiceImplCacheTest extends TestCase imapServiceImpl.setImapHome(imapHome); // Starting IMAP - imapServiceImpl.startupInTxn(); + imapServiceImpl.startupInTxn(true); nodeRefs = searchService.selectNodes(storeRootNodeRef, companyHomePathInStore + "/" + NamespaceService.CONTENT_MODEL_PREFIX + ":" + TEST_IMAP_FOLDER_NAME, diff --git a/source/java/org/alfresco/repo/imap/ImapServiceImplTest.java b/source/java/org/alfresco/repo/imap/ImapServiceImplTest.java index 1921d511ae..7e0af369cd 100644 --- a/source/java/org/alfresco/repo/imap/ImapServiceImplTest.java +++ b/source/java/org/alfresco/repo/imap/ImapServiceImplTest.java @@ -180,7 +180,7 @@ public class ImapServiceImplTest extends TestCase imapServiceImpl.setImapHome(imapHome); // Starting IMAP - imapServiceImpl.startupInTxn(); + imapServiceImpl.startupInTxn(true); nodeRefs = searchService.selectNodes(storeRootNodeRef, companyHomePathInStore + "/" + NamespaceService.CONTENT_MODEL_PREFIX + ":" + TEST_IMAP_FOLDER_NAME, diff --git a/source/java/org/alfresco/repo/imap/LoadTester.java b/source/java/org/alfresco/repo/imap/LoadTester.java index 9aec62b9fd..144768b26b 100644 --- a/source/java/org/alfresco/repo/imap/LoadTester.java +++ b/source/java/org/alfresco/repo/imap/LoadTester.java @@ -163,7 +163,7 @@ public class LoadTester extends TestCase imapServiceImpl.setImapHome(imapHome); // Starting IMAP - imapServiceImpl.startupInTxn(); + imapServiceImpl.startupInTxn(true); nodeRefs = searchService.selectNodes(storeRootNodeRef, companyHomePathInStore + "/" + NamespaceService.CONTENT_MODEL_PREFIX + ":" + TEST_IMAP_ROOT_FOLDER_NAME,