diff options
| author | Alex Rudyy <orudyy@apache.org> | 2013-02-28 16:12:44 +0000 |
|---|---|---|
| committer | Alex Rudyy <orudyy@apache.org> | 2013-02-28 16:12:44 +0000 |
| commit | 64a8d0597846e5ba04836a0c6554df8f4fd2c57a (patch) | |
| tree | fc1aef880805a9c6d8c81e62ae212fdcc92ef3ac /java | |
| parent | ff671a2adbbbcf9d2ba26e2157eaac3b5ef4e072 (diff) | |
| download | qpid-python-64a8d0597846e5ba04836a0c6554df8f4fd2c57a.tar.gz | |
QPID-4609: Use correct synchronization lock in BrokerAdapter#getKeyStores().
Fix suggested by Jakub Scholz
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1451243 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
| -rw-r--r-- | java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java b/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java index 197f70a884..4008b419de 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java +++ b/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java @@ -878,7 +878,7 @@ public class BrokerAdapter extends AbstractAdapter implements Broker, Configurat @Override public Collection<KeyStore> getKeyStores() { - synchronized(_trustStores) + synchronized(_keyStores) { return Collections.unmodifiableCollection(_keyStores.values()); } |