coding style fix
Merge pull request #6921 from minggo/code-fix

coding style fix