code cleanup, fixed some warnings reported by FindBugs and PMD
Authored by: mrieser 2010-03-04
Parent: [r10653]
Child: [r10655]