fix findbugs issues related to transactions
Merge pull request #3584 from eminn/fix/findbugs

fix findbugs issues related to transactions