DefaultSubscriptionRegistry's removeSubscriptionInternal defensively handles non-existing destinations

Issue: SPR-11832

Author: jhoeller

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

@@ -48,12 +48,12 @@ public class DefaultSubscriptionRegistry extends AbstractSubscriptionRegistry {
 	/** The maximum number of entries in the cache */
 	private volatile int cacheLimit = DEFAULT_CACHE_LIMIT;
 
+	private PathMatcher pathMatcher = new AntPathMatcher();
+
 	private final DestinationCache destinationCache = new DestinationCache();
 
 	private final SessionSubscriptionRegistry subscriptionRegistry = new SessionSubscriptionRegistry();
 
-	private PathMatcher pathMatcher = new AntPathMatcher();
-
 
 	/**
 	 * Specify the maximum number of entries for the resolved destination cache.
@@ -71,19 +71,20 @@ public int getCacheLimit() {
 	}
 
 	/**
-	 * The PathMatcher to use.
+	 * Specify the {@link PathMatcher} to use.
 	 */
 	public void setPathMatcher(PathMatcher pathMatcher) {
 		this.pathMatcher = pathMatcher;
 	}
 
 	/**
-	 * The configured PathMatcher.
+	 * Return the configured {@link PathMatcher}.
 	 */
 	public PathMatcher getPathMatcher() {
 		return this.pathMatcher;
 	}
 
+
 	@Override
 	protected void addSubscriptionInternal(String sessionId, String subsId, String destination, Message<?> message) {
 		this.subscriptionRegistry.addSubscription(sessionId, subsId, destination);
@@ -95,7 +96,7 @@ protected void removeSubscriptionInternal(String sessionId, String subsId, Messa
 		SessionSubscriptionInfo info = this.subscriptionRegistry.getSubscriptions(sessionId);
 		if (info != null) {
 			String destination = info.removeSubscription(subsId);
-			if (info.getSubscriptions(destination) == null) {
+			if (destination != null && info.getSubscriptions(destination) == null) {
 				this.destinationCache.updateAfterRemovedSubscription(destination, sessionId, subsId);
 			}
 		}
@@ -206,9 +207,9 @@ public void updateAfterRemovedSubscription(String destination, String sessionId,
 						}
 					}
 				}
-				for (String d : destinationsToRemove) {
-					this.updateCache.remove(d);
-					this.accessCache.remove(d);
+				for (String destinationToRemove : destinationsToRemove) {
+					this.updateCache.remove(destinationToRemove);
+					this.accessCache.remove(destinationToRemove);
 				}
 			}
 		}