fixing CARBON-14223, patch by - Ananda Manoj

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/kernel/trunk@179020 a5903396-d722-0410-b921-86c7d4935375
fixing https://wso2.org/jira/browse/CARBON-14229

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/kernel/trunk@179022 a5903396-d722-0410-b921-86c7d4935375