From d6a105c15164083f87cce477379ecd6645a5e7b2 Mon Sep 17 00:00:00 2001
From: chaewon121 <cw121@naver.com>
Date: Wed, 27 Sep 2023 11:16:26 +0900
Subject: [PATCH] Polish Conditional Statements

See gh-31320
---
 .../web/servlet/mvc/condition/ParamsRequestCondition.java  | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ParamsRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ParamsRequestCondition.java
index 2c1ea0a921..416a79316f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ParamsRequestCondition.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ParamsRequestCondition.java
@@ -90,13 +90,10 @@ public final class ParamsRequestCondition extends AbstractRequestCondition<Param
 	 */
 	@Override
 	public ParamsRequestCondition combine(ParamsRequestCondition other) {
-		if (isEmpty() && other.isEmpty()) {
+		if (other.isEmpty()) {
 			return this;
 		}
-		else if (other.isEmpty()) {
-			return this;
-		}
-		else if (isEmpty()) {
+		if (isEmpty()) {
 			return other;
 		}
 		Set<ParamExpression> set = new LinkedHashSet<>(this.expressions);