From 127d6c6ca8c2fca8b882b782ea694ed5cd4c7971 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Sat, 31 Jan 2015 12:28:35 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)    93591:
 Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)       93523: Merged DEV
 (5.0.1) to 5.0.N (5.0.1)          93517: MNT-13089: RepoAdminServiceImplTest
 hangs on SQL Server          Fixed
 MultiUserRenditionTest.testRenditionOwnerHasChangedAfterSourceOwnerChange()
 to run on MS SQL Server.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94978 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../repo/rendition/MultiUserRenditionTest.java         | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/source/test-java/org/alfresco/repo/rendition/MultiUserRenditionTest.java b/source/test-java/org/alfresco/repo/rendition/MultiUserRenditionTest.java
index 20c8945935..d3fa2ebd6d 100644
--- a/source/test-java/org/alfresco/repo/rendition/MultiUserRenditionTest.java
+++ b/source/test-java/org/alfresco/repo/rendition/MultiUserRenditionTest.java
@@ -234,11 +234,19 @@ public class MultiUserRenditionTest
         
         // Create another doc as non-admin
         AuthenticationUtil.setFullyAuthenticatedUser(NON_ADMIN_USER);
+        final NodeRef nonAdminPdfNode = txnHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<NodeRef>()
+        {
+            public NodeRef execute() throws Throwable
+            {
+                NodeRef nonAdminPdfNode = createPdfDocumentAsCurrentlyAuthenticatedUser(NON_ADMIN_USER + "_content");
+                return nonAdminPdfNode;
+            }
+        });
+
         final Pair<NodeRef, NodeRef> nonAdminNodes = txnHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Pair<NodeRef, NodeRef>>()
                 {
                     public Pair<NodeRef, NodeRef> execute() throws Throwable
                     {
-                        NodeRef nonAdminPdfNode = createPdfDocumentAsCurrentlyAuthenticatedUser(NON_ADMIN_USER + "_content");
                         renditionService.render(nonAdminPdfNode, doclibRendDefQName);
                         // caches rendition owner
                         NodeRef nonAdminRenditionNode = renditionService.getRenditions(nonAdminPdfNode).get(0).getChildRef();