Code format. No functional change.
Remove unnecessary blocks.

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