[AMQ-9376] Fix concurrent modification in ActiveMQServiceFactory

• Type: Bug
• Status: Resolved
• Priority: Minor
• Resolution: Fixed
• Fix Version/s: 6.0.0, 5.18.4, 5.17.7
• Component/s: OSGi/Karaf
• Assignee: Matt Pavlovich
• Reporter: Matt Pavlovich
• Created: 02/Nov/23 04:47
• Updated: 09/Nov/23 13:06
• Resolved: 09/Nov/23 13:06

Description

Need a class instance level lock or duplicate list around the broker map when doing a .destroy() caused by bundle refesh

Calling .destroy() loops over a map which calls deleted.. which fails when there is more than one bundle and the bundle is shutdown first (not a service(s) removed via .cfg delete or osgi service shutdown lifecycle).

#1. OSGi calls..

    synchronized public void destroy() {
        for (String broker : brokers.keySet()) {
            deleted(broker);
        }
    }

#2. Which blows up here.. due to concurrent modification on the brokers collection

    @Override
    synchronized public void deleted(String pid) {
        ServiceRegistration<BrokerService> reg = brokerRegs.remove(pid);
        if (reg != null) {
            reg.unregister();
        }
        BrokerService broker = brokers.remove(pid);
        if (broker != null) {
            stop(pid, broker);
        }
    }