Fix bad merge
Review by kkolinko

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1577464 13f79535-47bb-0310-9956-ffa450edef68
Review by kkolinko
Avoid adding nulls to the map
Log a warning for problems in addSelf() as well as add()

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