X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fsrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fportalapp%2Fportal%2Fservice%2FFunctionalMenuServiceImpl.java;h=87143e85f10a8638e6ba287b7ce5c46b0ba6ba2e;hb=23634dba70b166ad3c79b5eadfbd32b5375d44be;hp=6a71bc714ccf48a5a9b3aff7e9b943c8b4cf55d5;hpb=4ba6a0f20a190030700917a6065a6779ca9d308f;p=portal.git

diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/FunctionalMenuServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/FunctionalMenuServiceImpl.java
index 6a71bc71..87143e85 100644
--- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/FunctionalMenuServiceImpl.java
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/FunctionalMenuServiceImpl.java
@@ -284,7 +284,7 @@ public class FunctionalMenuServiceImpl implements FunctionalMenuService {
 		logQuery(sql);
 		@SuppressWarnings("unchecked")
 		List<FunctionalMenuRole> roleItems = dataAccessService.executeSQLQuery(sql, FunctionalMenuRole.class, null);
-		if (roleItems.size() > 0) {
+		if (roleItems.size() > 0 && menuItem != null) {
 			Integer appid = roleItems.get(0).appId;
 			menuItem.appid = appid;
 			List<Integer> roles = new ArrayList<Integer>();