Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.0.x'

Browse Source 
# Conflicts:
#	spring-context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java
This commit is contained in:
Juergen Hoeller
2023-07-19 00:37:06 +02:00
parent 33862d98ea 2f33e77ab4
commit 25ea1f4c0f
97 changed files with 405 additions and 822 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-messaging/src/test/java/org/springframework/messaging/simp/user/TestSimpSubscription.java
View File

@@ -59,14 +59,9 @@ public class TestSimpSubscription implements SimpSubscription {
@Override
public boolean equals(@Nullable Object other) {
if (this == other) {
return true;
}
if (!(other instanceof SimpSubscription otherSubscription)) {
return false;
}
return (ObjectUtils.nullSafeEquals(getSession(), otherSubscription.getSession()) &&
this.id.equals(otherSubscription.getId()));
return (this == other || (other instanceof SimpSubscription that &&
ObjectUtils.nullSafeEquals(getSession(), that.getSession()) &&
this.id.equals(that.getId())));
}
@Override