root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '6.1.x'

This commit is contained in:
rstoyanchev 2024-04-18 14:18:43 +01:00
parent a985c0bb35 97eddb769a
commit aa05a6a3b3
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-messaging/src/main/java/org/springframework/messaging/simp/broker/DefaultSubscriptionRegistry.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -305,6 +305,9 @@ public class DefaultSubscriptionRegistry extends AbstractSubscriptionRegistry {
return Collections.singletonList(subscriptionId);
}
else {
if (subscriptionIds.contains(subscriptionId)) {
return subscriptionIds;
}
List<String> result = new ArrayList<>(subscriptionIds.size() + 1);
result.addAll(subscriptionIds);
result.add(subscriptionId);

10
spring-messaging/src/test/java/org/springframework/messaging/simp/broker/DefaultSubscriptionRegistryTests.java
View File

@ -102,6 +102,16 @@ class DefaultSubscriptionRegistryTests {
MultiValueMap<String, String> actual = this.registry.findSubscriptions(createMessage(dest));
assertThat(actual).hasSize(1);
assertThat(actual.get(sessId)).containsExactly(subId);
// Register more after destinationCache populated through findSubscriptions,
// and make sure it's still only one subscriptionId
this.registry.registerSubscription(subscribeMessage(sessId, subId, dest));
this.registry.registerSubscription(subscribeMessage(sessId, subId, dest));
actual = this.registry.findSubscriptions(createMessage(dest));
assertThat(actual).hasSize(1);
assertThat(actual.get(sessId)).containsExactly(subId);
}
@Test