From 2a0680c2bae72d76d0072983cd9eeed5ee494e2e Mon Sep 17 00:00:00 2001 From: dreis2211 Date: Fri, 14 Dec 2018 12:07:51 +0100 Subject: [PATCH] Fix StringSequence.equals() for different lengths See gh-15465 --- .../springframework/boot/loader/jar/StringSequence.java | 2 +- .../boot/loader/jar/StringSequenceTests.java | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/StringSequence.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/StringSequence.java index 896c45561b..1e31543275 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/StringSequence.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/StringSequence.java @@ -126,7 +126,7 @@ final class StringSequence implements CharSequence { } return true; } - return true; + return false; } @Override diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/StringSequenceTests.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/StringSequenceTests.java index d9d2d48ece..fc111c90ba 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/StringSequenceTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/StringSequenceTests.java @@ -167,6 +167,13 @@ public class StringSequenceTests { assertThat(a).isEqualTo(b).isNotEqualTo(c); } + @Test + public void notEqualsWhenSequencesOfDifferentLength() { + StringSequence a = new StringSequence("abcd"); + StringSequence b = new StringSequence("ef"); + assertThat(a).isNotEqualTo(b); + } + @Test public void startsWithWhenExactMatch() { assertThat(new StringSequence("abc").startsWith("abc")).isTrue();