Merge from HEAD to WCM-DEV2.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3659 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-09-02 18:19:00 +00:00
parent db3c29b45e
commit 820da6ecab
147 changed files with 9873 additions and 1289 deletions

View File

@@ -16,7 +16,6 @@
*/
package org.alfresco.repo.cache;
import java.io.IOException;
import java.io.Serializable;
import java.util.List;
@@ -438,15 +437,8 @@ public class TransactionalCache<K extends Serializable, V extends Serializable>
// and also serves to ensure that the shared cache will be ignored
// for the remainder of the transaction
txnData.isClearOn = true;
try
{
txnData.updatedItemsCache.removeAll();
txnData.removedItemsCache.removeAll();
}
catch (IOException e)
{
throw new AlfrescoRuntimeException("Failed to clear caches", e);
}
txnData.updatedItemsCache.removeAll();
txnData.removedItemsCache.removeAll();
}
else // no transaction
{