Code simplification & reformatting - no functional change

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1616307 13f79535-47bb-0310-9956-ffa450edef68
Re-ordering - no functional change

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1616308 13f79535-47bb-0310-9956-ffa450edef68
Ensure unbind() is always called after calling bind()

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1616309 13f79535-47bb-0310-9956-ffa450edef68
Refactor - no functional change

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1616310 13f79535-47bb-0310-9956-ffa450edef68