Add improvements for chat feature

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/metadata/mgt/MetadataManagementServiceImpl.java

@@ -20,6 +20,7 @@ package org.wso2.carbon.device.mgt.core.metadata.mgt;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.base.MultitenantConstants;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.PaginationRequest;
 import org.wso2.carbon.device.mgt.common.PaginationResult;
@@ -91,8 +92,12 @@ public class MetadataManagementServiceImpl implements MetadataManagementService
         }
         try {
             MetadataManagementDAOFactory.openConnection();
-            return metadataDAO.getMetadata(
+            if (metaKey.equals("EVALUATE_TENANTS")){
-                    PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true), metaKey);
+                return metadataDAO.getMetadata(MultitenantConstants.SUPER_TENANT_ID, metaKey);
+            } else {
+                return metadataDAO.getMetadata(
+                        PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true), metaKey);
+            }
         } catch (MetadataManagementDAOException e) {
             String msg = "Error occurred while retrieving the metadata entry for metaKey:" + metaKey;
             log.error(msg, e);