kkolinko review
Fix a typo.
Simplify where values are known to be non-null
Specify and test behaviour with null and non-String key values.


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