bz910577 - recheck on race condition

[merge]