Commit 813a6966 authored by Stephane Nicoll's avatar Stephane Nicoll

Merge branch '1.5.x'

parents d408ce2d 03174277
...@@ -81,9 +81,12 @@ public class Sanitizer { ...@@ -81,9 +81,12 @@ public class Sanitizer {
* @return the potentially sanitized value * @return the potentially sanitized value
*/ */
public Object sanitize(String key, Object value) { public Object sanitize(String key, Object value) {
if (value == null) {
return null;
}
for (Pattern pattern : this.keysToSanitize) { for (Pattern pattern : this.keysToSanitize) {
if (pattern.matcher(key).matches()) { if (pattern.matcher(key).matches()) {
return (value == null ? null : "******"); return "******";
} }
} }
return value; return value;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment