correctly close stream

git-svn-id: https://svn.apache.org/repos/asf/tomcat/maven-plugin/trunk@1538554 13f79535-47bb-0310-9956-ffa450edef68
use better variable names

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