Further work on DBCP-219

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