build error
Merge remote-tracking branch 'upstream/master'
replace lock with AtomicLong for increment a long value
merge