make sure all the thread will going to work

Change-Id: Ia64995f01080044a08b1916a54660956d76f9fee
Signed-off-by: li levi <levi.li@sap.com>