From 87f28ce48ebc672ffaea31f9524a6e770a01aa1f Mon Sep 17 00:00:00 2001 From: Deycoesr Date: Sat, 18 Apr 2020 00:32:02 +0800 Subject: [PATCH] Simplify some control flow code Closes gh-24925 --- .../springframework/web/bind/support/WebRequestDataBinder.java | 2 +- .../org/springframework/web/util/pattern/RegexPathElement.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/web/bind/support/WebRequestDataBinder.java b/spring-web/src/main/java/org/springframework/web/bind/support/WebRequestDataBinder.java index 4ec17ed3e75..eff3cde7703 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/support/WebRequestDataBinder.java +++ b/spring-web/src/main/java/org/springframework/web/bind/support/WebRequestDataBinder.java @@ -130,7 +130,7 @@ public class WebRequestDataBinder extends WebDataBinder { */ private boolean isMultipartRequest(WebRequest request) { String contentType = request.getHeader("Content-Type"); - return (contentType != null && StringUtils.startsWithIgnoreCase(contentType, "multipart")); + return StringUtils.startsWithIgnoreCase(contentType, "multipart"); } private void bindParts(HttpServletRequest request, MutablePropertyValues mpvs) { diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/RegexPathElement.java b/spring-web/src/main/java/org/springframework/web/util/pattern/RegexPathElement.java index ae222c0b43b..dd55d5c39c4 100644 --- a/spring-web/src/main/java/org/springframework/web/util/pattern/RegexPathElement.java +++ b/spring-web/src/main/java/org/springframework/web/util/pattern/RegexPathElement.java @@ -136,7 +136,7 @@ class RegexPathElement extends PathElement { if (matches) { if (isNoMorePattern()) { if (matchingContext.determineRemainingPath && - (this.variableNames.isEmpty() ? true : textToMatch.length() > 0)) { + (this.variableNames.isEmpty() || textToMatch.length() > 0)) { matchingContext.remainingPathIndex = pathIndex + 1; matches = true; }