PLF-5669:Fix the violations found by Sonar - 2014-W04