Fix NPE caused by switch to ConcurrentHashMap identified by unit tests

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH@1563096 13f79535-47bb-0310-9956-ffa450edef68