GitHub user mtaylor opened a pull request:

    https://github.com/apache/activemq-artemis/pull/1202

    ARTEMIS-1111 Avoid deadlock on AMQP delivery during close

    I wanted to avoid the possibility of adding more race/lock conditions by 
introducing new Executors/Threads when dealing with the situation described by 
ARTEMIS-1111.  Instead I've upgraded the connection lock to a re-entrant lock.  
Instead of the consumer delivery thread blocking forever when the ProtonHandler 
lock is held by the close() event, it does a tryLock(), then checks to see if 
the link is closed.  If so it will exit.  If not it will retry.

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/mtaylor/activemq-artemis ARTEMIS-1111

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/activemq-artemis/pull/1202.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #1202
    
----
commit 153053f8c71585bdfd66c353269a9e87aa1942f7
Author: Martyn Taylor <[email protected]>
Date:   2017-04-12T13:38:06Z

    ARTEMIS-1111 Avoid deadlock on AMQP delivery during close

----


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---

Reply via email to