X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportalapp%2Fportal%2Fservice%2FUserNotificationServiceImpl.java;fp=ecomp-portal-BE-common%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportalapp%2Fportal%2Fservice%2FUserNotificationServiceImpl.java;h=aa3a4b128ef1f2d46cb5bb176d2696002e6462cf;hb=3aa28e9dd68cce134644223505f326378b5d91a8;hp=130c99e720e3ef2d84ffd52c4d10f42d347e6c59;hpb=08f55be6a0a9708ceeb176d5e1a0a56f885fad59;p=portal.git

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/UserNotificationServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/UserNotificationServiceImpl.java
index 130c99e7..aa3a4b12 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/UserNotificationServiceImpl.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/UserNotificationServiceImpl.java
@@ -73,7 +73,7 @@ public class UserNotificationServiceImpl implements UserNotificationService {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.openecomp.portalapp.portal.service.UserNotificationService#
+	 * @see org.onap.portalapp.portal.service.UserNotificationService#
 	 * getNotifications(java.lang.Long)
 	 */
 	@Override
@@ -93,7 +93,7 @@ public class UserNotificationServiceImpl implements UserNotificationService {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.openecomp.portalapp.portal.service.UserNotificationService#
+	 * @see org.onap.portalapp.portal.service.UserNotificationService#
 	 * getNotificationHistoryVO(java.lang.Long)
 	 */
 	@Override
@@ -109,7 +109,7 @@ public class UserNotificationServiceImpl implements UserNotificationService {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.openecomp.portalapp.portal.service.UserNotificationService#
+	 * @see org.onap.portalapp.portal.service.UserNotificationService#
 	 * getAdminNotificationVOS()
 	 */
 	@Override
@@ -125,7 +125,7 @@ public class UserNotificationServiceImpl implements UserNotificationService {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.openecomp.portalapp.portal.service.UserNotificationService#
+	 * @see org.onap.portalapp.portal.service.UserNotificationService#
 	 * getNotificationRoles(java.lang.Long)
 	 */
 	@Override
@@ -141,7 +141,7 @@ public class UserNotificationServiceImpl implements UserNotificationService {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.openecomp.portalapp.portal.service.UserNotificationService#
+	 * @see org.onap.portalapp.portal.service.UserNotificationService#
 	 * getAppRoleList()
 	 */
 	@SuppressWarnings("unchecked")
@@ -155,7 +155,7 @@ public class UserNotificationServiceImpl implements UserNotificationService {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.openecomp.portalapp.portal.service.UserNotificationService#
+	 * @see org.onap.portalapp.portal.service.UserNotificationService#
 	 * setNotificationsRead(java.lang.Long, int)
 	 */
 	@Override
@@ -171,8 +171,8 @@ public class UserNotificationServiceImpl implements UserNotificationService {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.openecomp.portalapp.portal.service.UserNotificationService#
-	 * saveNotification(org.openecomp.portalapp.portal.transport.
+	 * @see org.onap.portalapp.portal.service.UserNotificationService#
+	 * saveNotification(org.onap.portalapp.portal.transport.
 	 * EpNotificationItem)
 	 */
 	@Override
@@ -196,7 +196,9 @@ public class UserNotificationServiceImpl implements UserNotificationService {
 		if (notificationItem.getNotificationId() != null) {
 			EpNotificationItem updateNotificationItem = (EpNotificationItem) getDataAccessService()
 					.getDomainObject(EpNotificationItem.class, notificationItem.getNotificationId(), null);
-			notificationItem.setRoles(updateNotificationItem.getRoles());
+			if(updateNotificationItem != null) {
+				notificationItem.setRoles(updateNotificationItem.getRoles());
+			}
 		}
 		if (notificationItem.msgSource == null) {
 			notificationItem.setMsgSource("EP");