Skip to content

Commit 3fca8c6

Browse files
committed
Merge branch '2.2.x' into 2.3.x
Closes gh-23441
2 parents fa81c37 + 4945806 commit 3fca8c6

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/StringSequence.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,11 @@ public StringSequence subSequence(int start, int end) {
7272
return new StringSequence(this.source, subSequenceStart, subSequenceEnd);
7373
}
7474

75-
boolean isEmpty() {
75+
/**
76+
* Returns {@code true} if the sequence is empty. Public to be compatible with JDK 15.
77+
* @return {@code true} if {@link #length()} is {@code 0}, otherwise {@code false}
78+
*/
79+
public boolean isEmpty() {
7680
return length() == 0;
7781
}
7882

src/checkstyle/checkstyle-suppressions.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,5 @@
4646
<suppress files="[\\/]src[\\/]intTest[\\/]java[\\/]" checks="SpringJavadoc" message="\@since" />
4747
<suppress files="LinuxDomainSocket" checks="FinalClass" message="SockaddrUn" />
4848
<suppress files="BsdDomainSocket" checks="FinalClass" message="SockaddrUn" />
49+
<suppress files="StringSequence" checks="SpringMethodVisibility"/>
4950
</suppressions>

0 commit comments

Comments
 (0)