kkolinko review - add missing trim() call

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1608300 13f79535-47bb-0310-9956-ffa450edef68
kkolinko review: Extend NPE protection

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