From 731af9444c01b53a0f4b3c6fefc06670fe002e89 Mon Sep 17 00:00:00 2001
From: izeye <izeye@naver.com>
Date: Fri, 17 Dec 2021 23:11:24 +0900
Subject: [PATCH] Polish HtmlCharacterEntityDecoder

See gh-27833
---
 .../web/util/HtmlCharacterEntityDecoder.java          | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityDecoder.java b/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityDecoder.java
index 2d6db518b2..6b966e6788 100644
--- a/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityDecoder.java
+++ b/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityDecoder.java
@@ -70,13 +70,6 @@ class HtmlCharacterEntityDecoder {
 				this.nextSemicolonPosition = this.originalMessage.indexOf(';', this.nextPotentialReferencePosition + 1);
 			}
 
-			boolean isPotentialReference = (this.nextPotentialReferencePosition != -1 &&
-					this.nextSemicolonPosition != -1 &&
-					this.nextSemicolonPosition - this.nextPotentialReferencePosition < MAX_REFERENCE_SIZE);
-
-			if (isPotentialReference) {
-				break;
-			}
 			if (this.nextPotentialReferencePosition == -1) {
 				break;
 			}
@@ -85,6 +78,10 @@ class HtmlCharacterEntityDecoder {
 				break;
 			}
 
+			if (this.nextSemicolonPosition - this.nextPotentialReferencePosition < MAX_REFERENCE_SIZE) {
+				break;
+			}
+
 			this.nextPotentialReferencePosition = this.nextPotentialReferencePosition + 1;
 		}
 		while (this.nextPotentialReferencePosition != -1);