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

Merged BRANCHES/V3.2 to HEAD:

Browse Source 
17409: ETHREEOH-1630 Webscript Kind=org.alfresco.repository.content.stream returns information about the Thumbnail webscript
   17444: Update svn:mergeinfo
   17940: Updated JBPM log level (GraphElement) to hide errors which should be handled by Alfresco retrying txn handler
   17989: AVM - unreported NPE in OrphanRepear (clustered)
   17997: WCM clustering - ensure Alfresco/JBPM job executor handles retries (from Alfresco retrying txn handler)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19197 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2010-03-10 17:16:34 +00:00
parent 1b8a6858c0
commit 07a68c5fa6
2 changed files with 134 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/java/org/alfresco/repo/avm/OrphanReaper.java
View File

@@ -271,6 +271,12 @@ public class OrphanReaper
return null;
}
AVMNode node = AVMDAOs.Instance().fAVMNodeDAO.getByID(fPurgeQueue.removeFirst());
if (node == null)
{
// eg. cluster, multiple reapers
continue;
}
// Save away the ancestor and merged from fields from this node.
HistoryLink hlink = AVMDAOs.Instance().fHistoryLinkDAO.getByDescendent(node);
AVMNode ancestor = null;
@@ -286,7 +292,7 @@ public class OrphanReaper
mergedFrom = mlink.getMfrom();
AVMDAOs.Instance().fMergeLinkDAO.delete(mlink);
}
// Get all the nodes that have this node as ancestor.
List<HistoryLink> links = AVMDAOs.Instance().fHistoryLinkDAO.getByAncestor(node);
for (HistoryLink link : links)
@@ -306,13 +312,13 @@ public class OrphanReaper
link.getMto().setMergedFrom(ancestor);
AVMDAOs.Instance().fMergeLinkDAO.delete(link);
}
// Get rid of all properties belonging to this node.
AVMDAOs.Instance().fAVMNodeDAO.deleteProperties(node.getId());
AVMDAOs.Instance().fAVMNodeDAO.deleteProperties(node.getId());
// Get rid of all aspects belonging to this node.
AVMDAOs.Instance().fAVMNodeDAO.deleteAspects(node.getId());
AVMDAOs.Instance().fAVMNodeDAO.deleteAspects(node.getId());
// Get rid of ACL.
DbAccessControlList acl = node.getAcl();
node.setAcl(null);