Fix class cast errors and make it harder to create a similar issue in the future

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