Patch given for ESBJAVA-2988

Applied the patch given by Isuru Gunawardana
Merge pull request #13 from vanjikumaran/master

Patch given for ESBJAVA-2988
Merge pull request #14 from dushansachinda/master

applied patch given under {https://wso2.org/jira/browse/ESBJAVA-3135}