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