root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Avoid NPE in PathMatchConfigurer 

Closes gh-28816
This commit is contained in:
rstoyanchev 2022-07-13 20:23:40 +01:00
parent f814fb420b
commit 4c08c276f7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;
} }