Merged r1593834 from tomcat/trunk:
Simplify. No functional change.


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