From b5b3647668ffd24ce8d736693a5191d9be7450ee Mon Sep 17 00:00:00 2001
From: charitha <charitha.ws@gmail.com>
Date: Fri, 6 Oct 2017 18:51:50 +0530
Subject: [PATCH] Fixed build and test failures after upstream merge

---
 .../wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java  | 5 +++--
 .../wso2/carbon/device/mgt/core/common/TestDataHolder.java   | 2 --
 .../org.wso2.carbon.device.mgt.basics.feature/pom.xml        | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

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 63193ff070..87b6e70ac7 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
@@ -430,8 +430,9 @@ public final class DeviceManagerUtil {
     public static boolean isPublishOperationResponseEnabled() throws DeviceManagementException {
         DeviceManagementConfig deviceManagementConfig = DeviceConfigurationManager.getInstance().
                 getDeviceManagementConfig();
-        if (deviceManagementConfig != null && isOperationAnalyticsEnabled()) {
-            return deviceManagementConfig.getOperationAnalyticsConfiguration().getPublishOperationResponse();
+        if (deviceManagementConfig != null) {
+            return isOperationAnalyticsEnabled()
+                   && deviceManagementConfig.getOperationAnalyticsConfiguration().getPublishOperationResponse();
         } else {
             throw new DeviceManagementException("Device-Mgt configuration has not initialized. Please check the " +
                                                         "cdm-config.xml file.");
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/common/TestDataHolder.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/common/TestDataHolder.java
index 355ec9a55a..dea79ea662 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/common/TestDataHolder.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/common/TestDataHolder.java
@@ -59,8 +59,6 @@ public class TestDataHolder {
 
     public static DeviceInfo generateDummyDeviceInfo() {
         DeviceInfo deviceInfo = new DeviceInfo();
-        deviceInfo.setIMEI("IMEI-12345");
-        deviceInfo.setIMSI("IMSI-12344");
         deviceInfo.setDeviceModel("DUMMY_MODEL");
         deviceInfo.setVendor("WSO2");
         deviceInfo.setOsVersion("OREO");
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/pom.xml
index 8f5826d1f2..5f072d95d5 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/pom.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/pom.xml
@@ -23,14 +23,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-feature</artifactId>
-        <version>3.0.119-SNAPSHOT</version>
+        <version>3.0.136-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.basics.feature</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.119-SNAPSHOT</version>
+    <version>3.0.136-SNAPSHOT</version>
     <name>WSO2 Carbon - Device Management Basics Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains the core bundles required for Basic Device Management functionality