Merge pull request #1034 from jbonofre/AMQ-9233

[AMQ-9233] Prevent NPE in SubQueueSelectorCacheBroker