Optimize connection close logic to resolve timeout delay issue

Optimize connection close logic to resolve timeout delay issue #595