An (I think) interesting log message added and one fixed using variable
This commit is contained in:
parent
14fbdd6fcf
commit
874d91537b
|
@ -170,7 +170,7 @@ public class UserSitesToGroupsAndRolesMapper {
|
||||||
} catch (UserManagementSystemException | UserRetrievalFault | GroupRetrievalFault
|
} catch (UserManagementSystemException | UserRetrievalFault | GroupRetrievalFault
|
||||||
| RoleRetrievalFault e) {
|
| RoleRetrievalFault e) {
|
||||||
|
|
||||||
log.error("Can't remove user role '" + gcRoleName + "' from: " + actualSite.getName(), e);
|
log.error("Can't remove user role '" + gcRoleName + "' from: " + actualSiteName, e);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
@ -237,18 +237,21 @@ public class UserSitesToGroupsAndRolesMapper {
|
||||||
for (Long actualGroupId : actualGroupAndRoles.keySet()) {
|
for (Long actualGroupId : actualGroupAndRoles.keySet()) {
|
||||||
try {
|
try {
|
||||||
String actualGroupName = groupManager.getGroup(actualGroupId).getGroupName();
|
String actualGroupName = groupManager.getGroup(actualGroupId).getGroupName();
|
||||||
if (groupManager.isVRE(actualGroupId) && !vreNames.contains(actualGroupName)) {
|
if (groupManager.isVRE(actualGroupId)) {
|
||||||
|
if (!vreNames.contains(actualGroupName)) {
|
||||||
log.info("Removing user from VRE: " + actualGroupName);
|
log.info("Removing user from VRE: " + actualGroupName);
|
||||||
try {
|
try {
|
||||||
userManager.dismissUserFromGroup(actualGroupId, user.getUserId());
|
userManager.dismissUserFromGroup(actualGroupId, user.getUserId());
|
||||||
} catch (UserRetrievalFault e) {
|
} catch (UserRetrievalFault e) {
|
||||||
log.error("Removing user from VRE: " + actualGroupName, e);
|
log.error("Removing user from VRE: " + actualGroupName, e);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (log.isDebugEnabled()) {
|
||||||
|
log.debug("User still belong to VRE: " + actualGroupName);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (log.isDebugEnabled()) {
|
log.debug("Do not check membership for non VRE: " + actualGroupName);
|
||||||
log.debug("User still belong to VRE: " + actualGroupName);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} catch (UserManagementSystemException | GroupRetrievalFault e) {
|
} catch (UserManagementSystemException | GroupRetrievalFault e) {
|
||||||
log.error("Checking if site group is a VRE", e);
|
log.error("Checking if site group is a VRE", e);
|
||||||
|
|
Loading…
Reference in New Issue