Merge patch branch changes to main.
This commit is contained in:
commit
a6719b1093
61 files changed
+1320
-288
No files matched your search
+1
-2
@@ -158,9 +158,8 @@ class DefaultEnvironment extends DelegatingEnvironment {
|
||||
logger.error("Defaulting to case-sensitive handling of "
|
||||
+ "usernames and group names as the desired case "
|
||||
+ "sensitivity configuration could not be read: {}",
|
||||
e.getMessage());
|
||||
e.getMessage(), e);
|
||||
|
||||
logger.debug("Error reading case sensitivity configuration.", e);
|
||||
return CaseSensitivity.ENABLED;
|
||||
|
||||
}
|
||||
|
||||
@@ -266,8 +266,9 @@ public class LocalEnvironment implements Environment {
|
||||
|
||||
}
|
||||
catch (IOException e) {
|
||||
logger.error("Unable to read connection parameter information from \"{}\": {}", file.getAbsolutePath(), e.getMessage());
|
||||
logger.debug("Error reading protocol JSON.", e);
|
||||
logger.error("Unable to read connection parameter "
|
||||
+ "information from \"{}\": {}",
|
||||
file.getAbsolutePath(), e.getMessage(), e);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -290,8 +291,9 @@ public class LocalEnvironment implements Environment {
|
||||
protocols.put(protocol, readProtocol(stream));
|
||||
}
|
||||
catch (IOException e) {
|
||||
logger.error("Unable to read pre-defined connection parameter information for protocol \"{}\": {}", protocol, e.getMessage());
|
||||
logger.debug("Error reading pre-defined protocol JSON.", e);
|
||||
logger.error("Unable to read pre-defined connection "
|
||||
+ "parameter information for protocol \"{}\": {}",
|
||||
protocol, e.getMessage(), e);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user