Merge branch 'master' of https://github.com/wso2/carbon-device-mgt

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

@@ -243,8 +243,8 @@ public class DeviceManagementServiceProviderImpl implements DeviceManagementServ
         String subject = "";
 
         for(NotificationMessages notificationMessage : notificationMessages){
-            if (notificationMessage.getType().equals(DeviceManagementConstants.EmailNotifications
+            if (DeviceManagementConstants.EmailNotifications.ENROL_NOTIFICATION_TYPE.
-                    .ENROL_NOTIFICATION_TYPE)){
+		                                                   equals(notificationMessage.getType())) {
                 messageHeader = notificationMessage.getHeader();
                 messageBody = notificationMessage.getBody();
                 messageFooter = notificationMessage.getFooter();
@@ -298,8 +298,8 @@ public class DeviceManagementServiceProviderImpl implements DeviceManagementServ
         String subject = "";
 
         for(NotificationMessages notificationMessage : notificationMessages){
-            if (notificationMessage.getType().equals(DeviceManagementConstants.EmailNotifications
+            if (DeviceManagementConstants.EmailNotifications.USER_REGISTRATION_NOTIFICATION_TYPE.
-                    .USER_REGISTRATION_NOTIFICATION_TYPE)){
+		                                                          equals(notificationMessage.getType())) {
                 messageHeader = notificationMessage.getHeader();
                 messageBody = notificationMessage.getBody();
                 messageFooter = notificationMessage.getFooter();