fix race detection listener implementation
Authored by: vincent_cave 2012-08-17
Parent: [r5681]
Child: [r5683]