From 1193910f526c7243dad0a3152a5fdf5d99153a1d Mon Sep 17 00:00:00 2001
From: inoshperera <inoshperera@gmail.com>
Date: Thu, 5 Mar 2020 20:59:00 +0530
Subject: [PATCH] minor refactoring for getTenantId

---
 .../details/mgt/impl/DeviceInformationManagerImpl.java     | 7 ++++++-
 .../carbon/device/mgt/core/util/DeviceManagerUtil.java     | 5 +++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/device/details/mgt/impl/DeviceInformationManagerImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/device/details/mgt/impl/DeviceInformationManagerImpl.java
index 5ccb9f6bd2..628321619f 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/device/details/mgt/impl/DeviceInformationManagerImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/device/details/mgt/impl/DeviceInformationManagerImpl.java
@@ -183,7 +183,7 @@ public class DeviceInformationManagerImpl implements DeviceInformationManager {
                 DeviceDetailsWrapper deviceDetailsWrapper = new DeviceDetailsWrapper();
                 deviceDetailsWrapper.setDevice(device);
                 deviceDetailsWrapper.setDeviceInfo(deviceInfo);
-                deviceDetailsWrapper.getJSONString();
+                deviceDetailsWrapper.setTenantId(DeviceManagerUtil.getTenantId());
                 GroupManagementProviderService groupManagementService = DeviceManagementDataHolder
                         .getInstance().getGroupManagementProviderService();
 
@@ -207,6 +207,11 @@ public class DeviceInformationManagerImpl implements DeviceInformationManager {
             } catch (UserStoreException e) {
                 log.error("Error occurred while getting role list", e);
             }
+        } else {
+            if(log.isTraceEnabled()) {
+                log.trace("Event publishing is not enabled for tenant "
+                        + DeviceManagerUtil.getTenantId());
+            }
         }
     }
 
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java
index 14d0aeba68..5ed3470c5c 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java
@@ -355,6 +355,11 @@ import java.util.stream.IntStream;
         }
     }
 
+    public static int getTenantId() {
+        return PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getTenantId();
+    }
+
     public static int validateActivityListPageSize(int limit) throws OperationManagementException {
         if (limit == 0) {
             DeviceManagementConfig deviceManagementConfig = DeviceConfigurationManager.getInstance().