From f25a37e97c3fe49415d222c6ca02d9e02cb0f900 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Fri, 20 Sep 2013 20:51:06 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX to HEAD (4.2)    55504: Merged
 V4.1-BUG-FIX (4.1.7) to HEAD-BUG-FIX (4.2)       55467: Merged V4.1.6 (4.1.6)
 to V4.1-BUG-FIX (4.1.7)          55414: Speculative fix to allow retrying to
 proceed during concurrent node modification           - I suspect that DB2
 choosing a different connection to kick out from the other DBs           -
 MNT-9598: RenditionServiceIntegrationTest failing on DB2

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55785 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../RenditionServiceIntegrationTest.java      | 59 ++++++++++---------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/source/test-java/org/alfresco/repo/rendition/RenditionServiceIntegrationTest.java b/source/test-java/org/alfresco/repo/rendition/RenditionServiceIntegrationTest.java
index 2b1e7906ef..2a497eda66 100644
--- a/source/test-java/org/alfresco/repo/rendition/RenditionServiceIntegrationTest.java
+++ b/source/test-java/org/alfresco/repo/rendition/RenditionServiceIntegrationTest.java
@@ -52,6 +52,7 @@ import org.alfresco.repo.rendition.executer.ImageRenderingEngine;
 import org.alfresco.repo.rendition.executer.ReformatRenderingEngine;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
 import org.alfresco.service.cmr.action.Action;
 import org.alfresco.service.cmr.coci.CheckOutCheckInService;
 import org.alfresco.service.cmr.lock.LockService;
@@ -544,7 +545,7 @@ public class RenditionServiceIntegrationTest extends BaseAlfrescoSpringTest
      */
     protected abstract class AbstractNodeModifyingRunnable implements Runnable
     {
-        protected Throwable modicationException;
+        protected Throwable modificationException;
         protected NodeRef nodeRef;
         
         public AbstractNodeModifyingRunnable(NodeRef nodeRef)
@@ -552,9 +553,9 @@ public class RenditionServiceIntegrationTest extends BaseAlfrescoSpringTest
             this.nodeRef = nodeRef;
         }
         
-        public Throwable getModicationException()
+        public Throwable getModificationException()
         {
-            return modicationException;
+            return modificationException;
         }
 
         protected abstract void modifyNode(NodeRef nodeRef);
@@ -562,27 +563,28 @@ public class RenditionServiceIntegrationTest extends BaseAlfrescoSpringTest
         @Override
         public void run()
         {
-            // Try to check out the document while it's rendering
-            transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Void>()
-                    {
-                        public Void execute() throws Throwable
-                        {
-                            // Wait a sufficient time for content transformer to start
-                            Thread.sleep(2000);
-                            
-                            try
-                            {
-                                modifyNode(nodeRef);
-                            }
-                            catch (Throwable e)
-                            {
-                                // Don't re-throw here or the node modification will just be retried
-                                modicationException = e;
-                            }
-                            
-                            return null;
-                        }
-                    });
+            RetryingTransactionCallback<Void> txnWork = new RetryingTransactionCallback<Void>()
+            {
+                @Override
+                public Void execute() throws Throwable
+                {
+                    // Wait a sufficient time for content transformer to start
+                    Thread.sleep(2000);
+                    modifyNode(nodeRef);
+                    return null;
+                }
+            };
+            // MNT-9598: RenditionServiceIntegrationTest failing on DB2
+            //           We have to give the transaction reties a chance i.e. DO NOT ABSORB EXCEPTIONS inside transaction.
+            //           Retrying is standard behaviour so absorbing the exception but still testing for it is guaranteeing failure.
+            try
+            {
+                transactionHelper.doInTransaction(txnWork);
+            }
+            catch (Exception e)
+            {
+                modificationException = e;
+            }
         }
     }
     
@@ -649,13 +651,12 @@ public class RenditionServiceIntegrationTest extends BaseAlfrescoSpringTest
         // and will always succeed after the rendition is complete, but due to the 
         // sleep in AbstractNodeModifyingRunnable isModificationUnblocked will still 
         // be false if there was a failure
-        String message = null;
-        if (nodeModifyingRunnable.getModicationException() != null)
+        if (nodeModifyingRunnable.getModificationException() != null)
         {
-            message = nodeModifyingRunnable.getModicationException().getMessage();
+            throw new RuntimeException(
+                    "Modification of node during long running rendition failed",
+                    nodeModifyingRunnable.getModificationException());
         }
-        assertNull("Modification of node during long running rendition failed: " + message, 
-                nodeModifyingRunnable.getModicationException());
     }
     
     /**