Refactor
- remove unnecessary null check
- use try-with-resources

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