Fix infinite loop

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

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