From 64a8d0597846e5ba04836a0c6554df8f4fd2c57a Mon Sep 17 00:00:00 2001 From: Alex Rudyy Date: Thu, 28 Feb 2013 16:12:44 +0000 Subject: 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 --- .../main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'java') 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 getKeyStores() { - synchronized(_trustStores) + synchronized(_keyStores) { return Collections.unmodifiableCollection(_keyStores.values()); } -- cgit v1.2.1