merge fix {https://wso2.org/jira/browse/ESBJAVA-3188}
Merge pull request #71 from dushansachinda/master

merge fix {https://wso2.org/jira/browse/ESBJAVA-3188}