summaryrefslogtreecommitdiff
path: root/qpid/java/test-profiles
diff options
context:
space:
mode:
authorKeith Wall <kwall@apache.org>2013-08-16 11:54:02 +0000
committerKeith Wall <kwall@apache.org>2013-08-16 11:54:02 +0000
commit88ca352ffee7df7e037bed1e73936e9b5d9b9ae2 (patch)
tree318ecbc0659f4d39c30993c078febc3dc7715166 /qpid/java/test-profiles
parenta037dbf505ed39472c1ce436faf1bece22334be1 (diff)
downloadqpid-python-88ca352ffee7df7e037bed1e73936e9b5d9b9ae2.tar.gz
QPID-5050: Move invocation of ExceptionListener to after the failoverMutex is released avoiding deadlock possibility
Previously, the ExceptionListener was invoked whilst the failoverMutex was held, between the two potential state changes (connection state change and session state change). This commit reorders the statements so that the ExceptionListner is fired after the failoverMutex is released. It also means that the ExceptionListener is fired *after* both connection/session have undergone any state changes. The exceptionListener member is also made thread safe. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1514664 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/test-profiles')
-rwxr-xr-xqpid/java/test-profiles/CPPExcludes1
-rwxr-xr-xqpid/java/test-profiles/Java010Excludes1
2 files changed, 2 insertions, 0 deletions
diff --git a/qpid/java/test-profiles/CPPExcludes b/qpid/java/test-profiles/CPPExcludes
index a75d96fb85..8ea592daf9 100755
--- a/qpid/java/test-profiles/CPPExcludes
+++ b/qpid/java/test-profiles/CPPExcludes
@@ -62,6 +62,7 @@ org.apache.qpid.test.client.timeouts.SyncWaitTimeoutDelayTest#*
// c++ broker doesn't support message bouncing
org.apache.qpid.server.exchange.ReturnUnroutableMandatoryMessageTest#*
org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testUnsubscribeWhenUsingSelectorMakesTopicUnreachable
+org.apache.qpid.test.unit.client.connection.ExceptionListenerTest#testExceptionListenerConnectionStopDeadlock
// c++ broker expires messages on delivery or when the queue cleaner thread runs.
org.apache.qpid.server.queue.TimeToLiveTest#testActiveTTL
diff --git a/qpid/java/test-profiles/Java010Excludes b/qpid/java/test-profiles/Java010Excludes
index 055ce25d75..02c2db1134 100755
--- a/qpid/java/test-profiles/Java010Excludes
+++ b/qpid/java/test-profiles/Java010Excludes
@@ -20,6 +20,7 @@
// Those tests are testing 0.8..-0-9-1 specific semantics
org.apache.qpid.test.client.ImmediateAndMandatoryPublishingTest#*
org.apache.qpid.test.client.CloseOnNoRouteForMandatoryMessageTest#*
+org.apache.qpid.test.unit.client.connection.ExceptionListenerTest#testExceptionListenerConnectionStopDeadlock
org.apache.qpid.systest.rest.BrokerRestTest#testSetCloseOnNoRoute
//this test checks explicitly for 0-8 flow control semantics