This problem is emergency to us. So I need a quick workround. I decide to fix it by implement the custom ValidityAuditStrategy class. I debug into it, and found the bug is caused by adding new data happened before removing old data. And the envers treat 'add->add->remove' as 'add->remove'. Perhaps I can change REVEND to hint envers removing is happened before adding.