Revert r1630059 and apply a better patch for the issue reported by FindBugs

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