Fix duplicate STOMP subscription id issue

baot · rstoyanchev · commit 44c31a6aad26 · 2017-05-19T15:20:14.000-04:00
Issue: SPR-15543
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/DefaultSubscriptionRegistry.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/DefaultSubscriptionRegistry.java
@@ -292,8 +292,11 @@ public void updateAfterNewSubscription(String destination, String sessionId, Str
 					String cachedDestination = entry.getKey();
 					if (getPathMatcher().match(destination, cachedDestination)) {
 						LinkedMultiValueMap<String, String> subs = entry.getValue();
-						subs.add(sessionId, subsId);
-						this.accessCache.put(cachedDestination, subs.deepCopy());
+						// Subscription id's may also be populated via getSubscriptions()
+						if (!subs.containsKey(sessionId) || !subs.get(sessionId).contains(subsId)) {
+							subs.add(sessionId, subsId);
+							this.accessCache.put(cachedDestination, subs.deepCopy());
+						}
 					}
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -292,8 +292,11 @@ public void updateAfterNewSubscription(String destination, String sessionId, Str`
`292`	`292`	`String cachedDestination = entry.getKey();`
`293`	`293`	`if (getPathMatcher().match(destination, cachedDestination)) {`
`294`	`294`	`LinkedMultiValueMap<String, String> subs = entry.getValue();`
`295`		`- subs.add(sessionId, subsId);`
`296`		`- this.accessCache.put(cachedDestination, subs.deepCopy());`
	`295`	`+ // Subscription id's may also be populated via getSubscriptions()`
	`296`	`+ if (!subs.containsKey(sessionId) \|\| !subs.get(sessionId).contains(subsId)) {`
	`297`	`+ subs.add(sessionId, subsId);`
	`298`	`+ this.accessCache.put(cachedDestination, subs.deepCopy());`
	`299`	`+ }`
`297`	`300`	`}`
`298`	`301`	`}`
`299`	`302`	`}`