nio client find-bugs issues
Merge pull request #1800 from gurbuzali/nio-find-bugs/3.x-master

nio client find-bugs issues