code refactoring

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@178063 a5903396-d722-0410-b921-86c7d4935375
code refactoring

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@178064 a5903396-d722-0410-b921-86c7d4935375
adding missed commit to trunk by ishan. Commit to branch was r176729.


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