You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2013/12/10 15:43:41 UTC
svn commit: r1549850 - in /qpid/branches/0.26/qpid/java: ./
amqp-1-0-client-jms/
amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/SessionImpl.java
Author: rgodfrey
Date: Tue Dec 10 14:43:40 2013
New Revision: 1549850
URL: http://svn.apache.org/r1549850
Log:
Merged r1549668 to 0.26 branch
Modified:
qpid/branches/0.26/qpid/java/ (props changed)
qpid/branches/0.26/qpid/java/amqp-1-0-client-jms/ (props changed)
qpid/branches/0.26/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/SessionImpl.java
Propchange: qpid/branches/0.26/qpid/java/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java:r1549668
Propchange: qpid/branches/0.26/qpid/java/amqp-1-0-client-jms/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/amqp-1-0-client-jms:r1549668
Modified: qpid/branches/0.26/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/SessionImpl.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.26/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/SessionImpl.java?rev=1549850&r1=1549849&r2=1549850&view=diff
==============================================================================
--- qpid/branches/0.26/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/SessionImpl.java (original)
+++ qpid/branches/0.26/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/SessionImpl.java Tue Dec 10 14:43:40 2013
@@ -276,14 +276,23 @@ public class SessionImpl implements Sess
{
_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);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org