NO JIRA:
- Changed the code to be java 1.6 compliant.