Revert r1516411 which was soem code clean-up that broke the old WebSocket implementation for NIO and APR

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