Fix a couple of Eclipse warnings.
Take advantage of some Java 7 features.

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