Merge pull request #449 from apache/fix_spotbugs

Some newly detected SpotBugs issues resolved.