Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Minor] Set default value for privilegeConflictResolution=MERGE

This commit is contained in:
Robert von Burg 2023-09-18 13:39:46 +02:00
parent e5cd14ac17
commit 57d61887e3
Signed by: eitch
GPG Key ID: 75DB9C85C74331F7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
privilege/src/main/java/li/strolch/privilege/handler/DefaultPrivilegeHandler.java
View File

@ -2133,7 +2133,7 @@ public class DefaultPrivilegeHandler implements PrivilegeHandler {
private void handleConflictResolutionParam(Map<String, String> parameterMap) {
String privilegeConflictResolutionS = parameterMap.get(PARAM_PRIVILEGE_CONFLICT_RESOLUTION);
if (privilegeConflictResolutionS == null) {
this.privilegeConflictResolution = PrivilegeConflictResolution.STRICT;
this.privilegeConflictResolution = PrivilegeConflictResolution.MERGE;
String msg = "No {0} parameter defined. Using {1}";
msg = format(msg, PARAM_PRIVILEGE_CONFLICT_RESOLUTION, this.privilegeConflictResolution);
logger.info(msg);