Applied patch {https://wso2.org/jira/browse/ESBJAVA-3096}
Merge pull request #29 from dushansachinda/master

Applied patch {https://wso2.org/jira/browse/ESBJAVA-3096}