[QPID-4609] Incorrect lock in the synchronize statement in org.apache.qpid.server.model.adapter.BrokerAdapter

• Type: Bug
• Status: Closed
• Priority: Minor
• Resolution: Fixed
• Affects Version/s: 0.21
• Fix Version/s: 0.21
• Component/s: Broker-J
• Assignee: Robbie Gemmell
• Reporter: Jakub Scholz
• Created: 28/Feb/13 12:12
• Updated: 11/Feb/15 20:06
• Resolved: 29/Mar/13 09:57

Description

The getTrustStores() and getKeyStores() methods of the BrokerAdapter class seem use both the _trustStores object as a lock for the sychronize statement:

@Override
public Collection<KeyStore> getKeyStores()
{
synchronized(_trustStores)

{ return Collections.unmodifiableCollection(_keyStores.values()); }

}

@Override
public Collection<TrustStore> getTrustStores()
{
synchronized(_trustStores)

{ return Collections.unmodifiableCollection(_trustStores.values()); }

}

Is that a bug? I would assume that the getKeyStores method should use the _keyStores object instead of _trustStores.