Bug 448459 - Fixed a concurrency issue with HashMap.

Change-Id: I6b1667cf1221e94d7bfff8abbfb5c2263cc43a22
Signed-off-by: Roman Flückiger <roman.flueckiger@mac.com>