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%2FExternalAccessRolesServiceImpl.java;h=4e83b9218850b30191f58f64710e22847fcec782;hb=8e83c25788017acd56271a72286f7dcbc974e76d;hp=9784356c0becc9a287abbfea7246acab7b90016e;hpb=6e50276a42ab82cfe34ced9cf97e545283f37f2a;p=portal.git

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImpl.java
index 9784356c..4e83b921 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImpl.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImpl.java
@@ -2893,7 +2893,7 @@ public class ExternalAccessRolesServiceImpl implements ExternalAccessRolesServic
 									roleFunction = dataAccessService.executeNamedQuery("getAppFunctionOnCodeAndAppId",
 											appFuncsParams, null);
 								}
-								if (!roleFunction.isEmpty()) {
+								if (!roleFunction.isEmpty() && roleId != null) {
 									EPAppRoleFunction apRoleFunction = new EPAppRoleFunction();
 									apRoleFunction.setAppId(app.getId());
 									apRoleFunction.setRoleId(roleId);