Fixed multi-threading bugs (NPEs) Submitted by: Joachim Unger <joachim.unger@softwareag.com> line ending correction ArrayList --> List, HashMap --> Map