From 7b7afa28e9d800db6b74e43608fddbfa1732d4da Mon Sep 17 00:00:00 2001
From: Andrew Hind <andy.hind@alfresco.com>
Date: Tue, 12 Mar 2013 11:11:08 +0000
Subject: [PATCH] Merge fix for
 org.alfresco.repo.cache.AbstractAsynchronouslyRefreshedCache<T> R 46078,
 46079, 46121 - fixes current build issues

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@47914 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../cache/AbstractAsynchronouslyRefreshedCache.java  | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/source/java/org/alfresco/repo/cache/AbstractAsynchronouslyRefreshedCache.java b/source/java/org/alfresco/repo/cache/AbstractAsynchronouslyRefreshedCache.java
index 271c96cd32..62e1630128 100644
--- a/source/java/org/alfresco/repo/cache/AbstractAsynchronouslyRefreshedCache.java
+++ b/source/java/org/alfresco/repo/cache/AbstractAsynchronouslyRefreshedCache.java
@@ -18,7 +18,6 @@
  */
 package org.alfresco.repo.cache;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
@@ -288,7 +287,6 @@ public abstract class AbstractAsynchronouslyRefreshedCache<T> implements Asynchr
      */
     private TransactionData getTransactionData()
     {
-        @SuppressWarnings("unchecked")
         TransactionData data = (TransactionData) AlfrescoTransactionSupport.getResource(resourceKeyTxnData);
         if (data == null)
         {
@@ -341,7 +339,14 @@ public abstract class AbstractAsynchronouslyRefreshedCache<T> implements Asynchr
                    return false;
                }
            }
-           return true;
+           if (AlfrescoTransactionSupport.getTransactionId() != null)
+           {
+               return (!getTransactionData().tenantIds.contains(tenantId));
+           }
+           else
+           {
+               return true;
+           }
        }
        finally
        {
@@ -747,6 +752,7 @@ public abstract class AbstractAsynchronouslyRefreshedCache<T> implements Asynchr
      * (non-Javadoc)
      * @see org.alfresco.repo.transaction.TransactionListener#flush()
      */
+    @SuppressWarnings("deprecation")
     @Override
     public void flush()
     {