X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportalapp%2Fportal%2Fcontroller%2FRoleManageController.java;h=c8e22d3990f3da0c0e518a37c1ae3ca8ba016332;hb=3ae49aa2258be96fca2ff34e4dc87dd0e0bae161;hp=c6849cd842c84608e83fb0d20dd9cfb4cf8fb3a7;hpb=a70761c096192e38800bf38d6c7f61f52bf72007;p=portal.git

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/RoleManageController.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/RoleManageController.java
index c6849cd8..c8e22d39 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/RoleManageController.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/RoleManageController.java
@@ -4,6 +4,8 @@
  * ===================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ===================================================================
+ * Modifications Copyright (c) 2019 Samsung
+ * ===================================================================
  *
  * Unless otherwise specified, all software contained herein is licensed
  * under the Apache License, Version 2.0 (the "License");
@@ -694,7 +696,7 @@ public class RoleManageController extends EPRestrictedBaseController {
 				externalAccessRolesService.syncApplicationRolesWithEcompDB(app);
 			} else {
 				logger.info(EELFLoggerDelegate.auditLogger,
-						"RoleManageController.syncRoles, Unauthorized user:" + user.getOrgUserId());
+						"RoleManageController.syncRoles, Unauthorized user:{}", user != null ? user.getOrgUserId() : "");
 				EcompPortalUtils.setBadPermissions(user, response, "createAdmin");
 				return new PortalRestResponse<>(PortalRestStatusEnum.ERROR, "Unauthorized User", "Failure");
 			}
@@ -713,10 +715,10 @@ public class RoleManageController extends EPRestrictedBaseController {
 			EPApp app = appService.getApp(appId);
 			if (isAuthorizedUser(user, app)) {
 				fieldsValidation(app);
-				externalAccessRolesService.syncRoleFunctionFromExternalAccessSystem(app);;
+				externalAccessRolesService.syncRoleFunctionFromExternalAccessSystem(app);
 			} else {
 				logger.info(EELFLoggerDelegate.auditLogger,
-						"RoleManageController.syncFunctions, Unauthorized user:" + user.getOrgUserId());
+						"RoleManageController.syncFunctions, Unauthorized user:{}", user != null ? user.getOrgUserId() : "");
 				EcompPortalUtils.setBadPermissions(user, response, "createAdmin");
 				return new PortalRestResponse<>(PortalRestStatusEnum.ERROR, "Unauthorized User", "Failure");
 			}
@@ -804,7 +806,7 @@ public class RoleManageController extends EPRestrictedBaseController {
 				logExterlaAuthRoleFunctionActivity(code , user, app, activityCode);
 			} else {
 				logger.info(EELFLoggerDelegate.auditLogger,
-						"RoleManageController.syncRoles, Unauthorized user:" + user.getOrgUserId());
+						"RoleManageController.syncRoles, Unauthorized user:{}", user != null ? user.getOrgUserId() : "");
 				EcompPortalUtils.setBadPermissions(user, response, "createAdmin");
 				return new PortalRestResponse<>(PortalRestStatusEnum.ERROR, "Unauthorized User", "Failure");
 			}