Merge branch '2.0.x' into 2.1.x

anshuman-mor · Dec 20, 2018 · 51d3626 · 51d3626
2 parents 210d1f6 + 8d0ad03
commit 51d3626
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/.../spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/StringSequence.java b/.../spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/StringSequence.java
@@ -66,6 +66,9 @@ public StringSequence subSequence(int start, int end) {
 		if (subSequenceEnd > this.end) {
 			throw new StringIndexOutOfBoundsException(end);
 		}
+		if (start == 0 && subSequenceEnd == this.end) {
+			return this;
+		}
 		return new StringSequence(this.source, subSequenceStart, subSequenceEnd);
 	}
 
@@ -100,10 +103,18 @@ public boolean startsWith(CharSequence prefix) {
 	}
 
 	public boolean startsWith(CharSequence prefix, int offset) {
-		if (length() - prefix.length() - offset < 0) {
+		int prefixLength = prefix.length();
+		if (length() - prefixLength - offset < 0) {
 			return false;
 		}
-		return subSequence(offset, offset + prefix.length()).equals(prefix);
+		int prefixOffset = 0;
+		int sourceOffset = offset;
+		while (prefixLength-- != 0) {
+			if (charAt(sourceOffset++) != prefix.charAt(prefixOffset++)) {
+				return false;
+			}
+		}
+		return true;
 	}
 
 	@Override