diff options
author | Robert Godfrey <rgodfrey@apache.org> | 2013-12-10 14:43:40 +0000 |
---|---|---|
committer | Robert Godfrey <rgodfrey@apache.org> | 2013-12-10 14:43:40 +0000 |
commit | 35078b9841e51abb442493611a237acb60086743 (patch) | |
tree | 7e8a958f6248262fb2512f70f344e869f7ddd78a | |
parent | bb09c20727552567d8369adbc4e51c0385d89613 (diff) | |
download | qpid-python-35078b9841e51abb442493611a237acb60086743.tar.gz |
Merged r1549668 to 0.26 branch
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.26@1549850 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/SessionImpl.java | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/SessionImpl.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/SessionImpl.java index 75243d1c43..3fa1032111 100644 --- a/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/SessionImpl.java +++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/SessionImpl.java @@ -276,14 +276,23 @@ public class SessionImpl implements Session, QueueSession, TopicSession { _closed = true; _dispatcher.close(); - for(MessageConsumerImpl consumer : _consumers) + + List<MessageConsumerImpl> consumers = null; + List<MessageProducerImpl> producers = null; + synchronized (_session.getEndpoint().getLock()) + { + consumers = new ArrayList<MessageConsumerImpl>(_consumers); + producers = new ArrayList<MessageProducerImpl>(_producers); + } + for(MessageConsumerImpl consumer : consumers) { consumer.close(); } - for(MessageProducerImpl producer : _producers) + for(MessageProducerImpl producer : producers) { producer.close(); } + _session.close(); _connection.removeSession(this); } |