Merge change 2267

* changes:
  Fix some Java mistakes found by FindBugs.