fixed timing and enclosed thread.join in a finally to avoid stopping the webapp before the request is finished (in case of assertion failure)

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