(OFBIZ-10571)
Following refactoring done -
-- Refactored code to fall in line with some java standards.
-- Based on FindBugs suggestion, refactored some classes to have static nested classes instead of inner class.
Thanks Girish Vasmatkar for reporting the issue and providing the patch.