PLF-5665:Fix the violations found by Sonar - 2014-W03