Merge 3.2 to HEAD:

16691: Merge 3.1 to 3.2
        15827: Fixed bug in delete node event processing
    16695: Merge 3.1 to 3.2
        16163: Added timestamp tracking via file state cache, added support for . and .. pseudo entries in wildcard folder search


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16976 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gary Spencer
2009-10-16 09:04:28 +00:00
parent 07a0200048
commit f4e057c0af
7 changed files with 569 additions and 30 deletions

View File

@@ -551,25 +551,30 @@ public class NodeMonitor extends TransactionListenerAdapter
return null;
}
// check for a node delete
if ( nodeEvent instanceof DeleteNodeEvent) {
// Node deleted
processDeleteNode((DeleteNodeEvent) nodeEvent);
}
// Check that the node is still valid
if (!m_nodeService.exists(nodeEvent.getNodeRef()))
else if (!m_nodeService.exists(nodeEvent.getNodeRef()))
{
return null;
}
// Process the node event, for an existing node
if ( nodeEvent instanceof CreateNodeEvent) {
// Node created
processCreateNode((CreateNodeEvent) nodeEvent);
}
else if ( nodeEvent instanceof DeleteNodeEvent) {
// Node deleted
processDeleteNode((DeleteNodeEvent) nodeEvent);
}
else if ( nodeEvent instanceof MoveNodeEvent) {
// Node moved
@@ -745,7 +750,7 @@ public class NodeMonitor extends TransactionListenerAdapter
if ( m_changeHandler.getGlobalNotifyMask() != 0) {
// Send a file created event to the change notification handler
// Send a file deleted event to the change notification handler
if ( deleteEvent.getFileType() == FileFolderServiceType.FILE)
m_changeHandler.notifyFileChanged(NotifyChange.ActionRemoved, relPath);