Browse Source

Merge pull request #10806 from izeye:handle-null-early

* pr/10806:
  Handle null early in Sanitizer.sanitize()
pull/8516/merge
Stephane Nicoll 8 years ago
parent
commit
03174277b4
  1. 5
      spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/Sanitizer.java

5
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/Sanitizer.java

@ -79,9 +79,12 @@ class Sanitizer { @@ -79,9 +79,12 @@ class Sanitizer {
* @return the potentially sanitized value
*/
public Object sanitize(String key, Object value) {
if (value == null) {
return null;
}
for (Pattern pattern : this.keysToSanitize) {
if (pattern.matcher(key).matches()) {
return (value == null ? null : "******");
return "******";
}
}
return value;

Loading…
Cancel
Save