Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58179 Fix atomicity violation (concurrent requests could both see null as the old value)