Simplify - merge locally used methods into constructor

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1540385 13f79535-47bb-0310-9956-ffa450edef68
Simplify - switch to local variables

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