Concurrency bug fix in ResultMap
7 files changed