inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-22 15:12:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.2.N (5.2.1) to HEAD (5.2)

Browse Source 
125037 cturlica: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124936 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         124872 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            124789 adavis: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
               124719 rmunteanu: Merged DEV to V4.2.6 (4.2.6)
                  124647: MNT-15847 : The RepoTransferReceiverImplTest.testNodeDeleteAndRestore fails intermittently on SQL Server and DB2
                     - reset mockedPolicyHandler before doCommitCB to ensure that only onEndInboundTransfer calls from doCommitCB are counted


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127772 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-06-03 16:08:01 +00:00
parent 2ae9cf58e2
commit 702e72d6a0
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/test-java/org/alfresco/repo/transfer/RepoTransferReceiverImplTest.java
View File

@@ -845,10 +845,12 @@ public class RepoTransferReceiverImplTest extends BaseAlfrescoSpringTest
/** /**
* First transfer test here * First transfer test here
*/ */
reset(mockedPolicyHandler);
try try
{ {
tran.doInTransaction(doFirstPrepareCB, false, true); tran.doInTransaction(doFirstPrepareCB, false, true);
//MNT-15847 ensure that all onEndInboundTransfer calls from setupCB are not
// counted in validateFirstCB
reset(mockedPolicyHandler);
tran.doInTransaction(doCommitCB, false, true); tran.doInTransaction(doCommitCB, false, true);
tran.doInTransaction(validateFirstCB, false, true); tran.doInTransaction(validateFirstCB, false, true);
} }