Merge pull request #15 from dushansachinda/master

Fixed regression issue due to patch https://wso2.org/jira/browse/ESBJAVA-3135