From 5dbcd554d2c1495e81201276fcbbc97258e1bce4 Mon Sep 17 00:00:00 2001
From: Andrei Rebegea <andrei.rebegea@ness.com>
Date: Wed, 6 Apr 2016 14:50:26 +0000
Subject: [PATCH] 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/BRANCHES/DEV/5.1.N/root@124936 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../alfresco/repo/transfer/RepoTransferReceiverImplTest.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/source/test-java/org/alfresco/repo/transfer/RepoTransferReceiverImplTest.java b/source/test-java/org/alfresco/repo/transfer/RepoTransferReceiverImplTest.java
index f7b2d8e203..a088fdddbd 100644
--- a/source/test-java/org/alfresco/repo/transfer/RepoTransferReceiverImplTest.java
+++ b/source/test-java/org/alfresco/repo/transfer/RepoTransferReceiverImplTest.java
@@ -845,10 +845,12 @@ public class RepoTransferReceiverImplTest extends BaseAlfrescoSpringTest
         /**
          * First transfer test here
          */
-        reset(mockedPolicyHandler);
         try
         {
             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(validateFirstCB, false, true);
         }