Polish dashIgnoringElementEquals()

See gh-16671

Polish dashIgnoringElementEquals()
See gh-16671
a89e6ff6 · Johnny Lim · Phillip Webb · ec72d287 · a89e6ff6
Commit a89e6ff6 authored Apr 26, 2019 by Johnny Lim Committed by Phillip Webb Jun 01, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 4 deletions

ConfigurationPropertyName.java .../context/properties/source/ConfigurationPropertyName.java +8 -4

No files found.
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationPropertyName.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationPropertyName.java
@@ -394,12 +394,16 @@ public final class ConfigurationPropertyName
 				i2++;
 			}
 		}
-		boolean indexed2 = e2.getType(i).isIndexed();
-		while (i2 < l2) {
-			char ch2 = e2.charAt(i, i2++);
-			if (indexed2 || ch2 != '-') {
+		if (i2 < l2) {
+			if (e2.getType(i).isIndexed()) {
 				return false;
 			}
+			do {
+				if (e2.charAt(i, i2++) != '-') {
+					return false;
+				}
+			}
+			while (i2 < l2);
 		}
 		return true;
 	}