inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge fix for org.alfresco.repo.cache.AbstractAsynchronouslyRefreshedCache<T> R 46078, 46079, 46121

Browse Source 
- fixes current build issues

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@47914 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrew Hind
2013-03-12 11:11:08 +00:00
parent bf7da274c4
commit 7b7afa28e9
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/java/org/alfresco/repo/cache/AbstractAsynchronouslyRefreshedCache.java vendored
View File

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