Author: robbie
Date: Mon May 20 10:55:30 2013
New Revision: 1484424
URL: http://svn.apache.org/r1484424
Log:
QPID-4851: Fix ConcurrentModificationException thrown on closing of AMQP 1.0
connection with existing sessions
mrged from trunk r1483121
Modified:
qpid/branches/0.22/qpid/java/ (props changed)
qpid/branches/0.22/qpid/java/amqp-1-0-client-jms/ (props changed)
qpid/branches/0.22/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionImpl.java
Propchange: qpid/branches/0.22/qpid/java/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java:r1483121
Propchange: qpid/branches/0.22/qpid/java/amqp-1-0-client-jms/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/amqp-1-0-client-jms:r1483121
Modified:
qpid/branches/0.22/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionImpl.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionImpl.java?rev=1484424&r1=1484423&r2=1484424&view=diff
==============================================================================
---
qpid/branches/0.22/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionImpl.java
(original)
+++
qpid/branches/0.22/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionImpl.java
Mon May 20 10:55:30 2013
@@ -334,7 +334,8 @@ public class ConnectionImpl implements C
if(_state != State.CLOSED)
{
stop();
- for(SessionImpl session : _sessions)
+ List<SessionImpl> sessions = new
ArrayList<SessionImpl>(_sessions);
+ for(SessionImpl session : sessions)
{
session.close();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
