Fix ESBJAVA-3171

https://wso2.org/jira/browse/ESBJAVA-3171