Browse Source

Avoid NPE in PathMatchConfigurer

Closes gh-28816
pull/28821/head
rstoyanchev 3 years ago
parent
commit
4c08c276f7
  1. 8
      spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/PathMatchConfigurer.java

8
spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/PathMatchConfigurer.java

@ -151,9 +151,9 @@ public class PathMatchConfigurer {
* {@code false} and use of this property becomes unnecessary. * {@code false} and use of this property becomes unnecessary.
*/ */
@Deprecated @Deprecated
public PathMatchConfigurer setUseSuffixPatternMatch(Boolean suffixPatternMatch) { public PathMatchConfigurer setUseSuffixPatternMatch(@Nullable Boolean suffixPatternMatch) {
this.suffixPatternMatch = suffixPatternMatch; this.suffixPatternMatch = suffixPatternMatch;
this.preferPathMatcher |= suffixPatternMatch; this.preferPathMatcher |= (suffixPatternMatch != null && suffixPatternMatch);
return this; return this;
} }
@ -173,9 +173,9 @@ public class PathMatchConfigurer {
* config options. * config options.
*/ */
@Deprecated @Deprecated
public PathMatchConfigurer setUseRegisteredSuffixPatternMatch(Boolean registeredSuffixPatternMatch) { public PathMatchConfigurer setUseRegisteredSuffixPatternMatch(@Nullable Boolean registeredSuffixPatternMatch) {
this.registeredSuffixPatternMatch = registeredSuffixPatternMatch; this.registeredSuffixPatternMatch = registeredSuffixPatternMatch;
this.preferPathMatcher |= registeredSuffixPatternMatch; this.preferPathMatcher |= (registeredSuffixPatternMatch != null && registeredSuffixPatternMatch);
return this; return this;
} }

Loading…
Cancel
Save