Adding the fix for issue https://wso2.org/jira/browse/ESBJAVA-3101