修复waiting timeout相关的判断