More refactoring of validation trying to debug failures on OSX with NIO.

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

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