Fix for bug 4266 (unnecessary concurent map and set in java file).