From c36b855e58ed8e45baf83af8424719ff554d0c5f Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Wed, 12 Feb 2014 00:37:51 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)    59023:
 Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)       58901: Merged
 V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)          58639: Merged DEV to
 V4.1-BUG-FIX (4.1.8)             58578: Merged DEV to DEV (4.1.8)            
    58570: MNT-9964 : DB2 unit tests failing                Replaced
 'TransactionInterceptor' with 'RetryingTransactionInterceptor' for
 TransferService_transaction.                The getThumbnailByName,
 getThumbnails, getFailedThumbnails methods are marked as read-only.          
   58611: MNT-9964 : DB2 unit tests failing             Added constraints to
 more methods in ThumbnailService.          58898: MNT-9964 : DB2 unit tests
 failing          Declared ThumbnailService.createThumbnail as read-only as we
 should be able to create thumbnails in read-only server state and via GET
 webscript.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62067 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/thumbnail-service-context.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/config/alfresco/thumbnail-service-context.xml b/config/alfresco/thumbnail-service-context.xml
index ce5ed21afc..81358bed2e 100644
--- a/config/alfresco/thumbnail-service-context.xml
+++ b/config/alfresco/thumbnail-service-context.xml
@@ -25,12 +25,20 @@
     </bean>
 
     <!-- Thumbnail service transaction bean -->
-    <bean id="ThumbnailService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
+    <bean id="ThumbnailService_transaction" class="org.alfresco.repo.transaction.RetryingTransactionInterceptor">
+        <property name="transactionService" ref="TransactionService" />
         <property name="transactionManager">
             <ref bean="transactionManager"/>
         </property>
         <property name="transactionAttributes">
             <props>
+                <prop key="getThumbnailRegistry">${server.transaction.mode.readOnly}</prop>
+                <prop key="getThumbnailByName">${server.transaction.mode.readOnly}</prop>
+                <prop key="getThumbnails">${server.transaction.mode.readOnly}</prop>
+                <prop key="getFailedThumbnails">${server.transaction.mode.readOnly}</prop>
+                <prop key="getThumbnailsEnabled">${server.transaction.mode.readOnly}</prop>
+                <!-- It is read-only intentionally, see MNT-9964 -->
+                <prop key="createThumbnail">${server.transaction.mode.readOnly}</prop>
                 <prop key="*">${server.transaction.mode.default}</prop>
             </props>
         </property>