summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2015-03-06 20:50:35 +0000
committerRobert Godfrey <rgodfrey@apache.org>2015-03-06 20:50:35 +0000
commitd2f82c0956f4e9dda9f7ff111b50c69436eb629b (patch)
treeb0c255258f56e3162ef2f909d0bcad00b05b28d2
parentc06a184615fe925f71c43be590669c61614e75b9 (diff)
downloadqpid-python-d2f82c0956f4e9dda9f7ff111b50c69436eb629b.tar.gz
QPID-6437 : ensure no locks are held when link endpoint listeners are notified
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1664714 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java
index e5a82eb2a3..f4484858a2 100644
--- a/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java
@@ -663,9 +663,14 @@ public class ConnectionEndpoint implements DescribedTypeConstructorRegistry.Sour
}
}
- public synchronized void receiveFlow(short channel, Flow flow)
+ public void receiveFlow(short channel, Flow flow)
{
- SessionEndpoint endPoint = getSession(channel);
+ SessionEndpoint endPoint;
+ synchronized (this)
+ {
+ endPoint = getSession(channel);
+ }
+
if (endPoint != null)
{
endPoint.receiveFlow(flow);