fix client behaviour on use the lock

Change-Id: I35b4e90b0eeb1569957ba2cb483953c2a036a6ef