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

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
100845: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100756: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         99878: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            99807: Merged DEV to V4.1-BUG-FIX (4.1.10)
               99672: MNT-12150 : Centera Connector : isContentUrlSupported is returning false for the Centera store
                  - Unit test to demonstrate issue was implemented.
                  - Previously suggested fix was also merged.
               99781: MNT-12150 : Centera Connector : isContentUrlSupported is returning false for the Centera store
                  - Updated javadoc for new method in ContentDataDAO.
                  - Corrected logic of eager cleaner. If store is read-only content should not be deleted.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100915 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-03-31 23:13:31 +00:00
parent 40fc727b0d
commit 17e4c1b55e
5 changed files with 147 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/java/org/alfresco/repo/content/cleanup/EagerContentStoreCleaner.java
View File

@@ -266,11 +266,17 @@ public class EagerContentStoreCleaner extends TransactionListenerAdapter
int deleted = 0;
for (ContentStore store : stores)
{
// Bypass if the store is read-only or doesn't support the URL
if (!store.isWriteSupported() || !store.isContentUrlSupported(contentUrl))
// Bypass if the store is read-only
if (!store.isWriteSupported())
{
continue;
}
// MNT-12150 fix, bypass if the store doesn't support the URL but mark as deleted
if (!store.isContentUrlSupported(contentUrl))
{
deleted++;
continue;
}
if (callListeners)
{
// Call listeners