applied patch given under {https://wso2.org/jira/browse/ESBJAVA-3135}
Merge pull request #14 from dushansachinda/master

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