Merged revisions r1429179 r1429180 r1429356 from tomcat/trunk:

Simplify the code.
- The method names are case-sensitive.
- We are returning "null" on failure, so there is no need to check whether an array entry is not-null before returning it.

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