You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ta...@apache.org on 2016/12/14 17:34:12 UTC

qpid-jms git commit: QPIDJMS-237 Cancel request once close of resource considered complete

Repository: qpid-jms
Updated Branches:
  refs/heads/master 387656944 -> 785487b81


QPIDJMS-237 Cancel request once close of resource considered complete

Once we consider the resource closed we need to cancel the timeout task
to avoid it lingering in the scheduler. 

Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/785487b8
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/785487b8
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/785487b8

Branch: refs/heads/master
Commit: 785487b818722cf640859d52731efdea954069d5
Parents: 3876569
Author: Timothy Bish <ta...@gmail.com>
Authored: Wed Dec 14 12:33:59 2016 -0500
Committer: Timothy Bish <ta...@gmail.com>
Committed: Wed Dec 14 12:33:59 2016 -0500

----------------------------------------------------------------------
 .../org/apache/qpid/jms/provider/amqp/AmqpAbstractResource.java | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/785487b8/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpAbstractResource.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpAbstractResource.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpAbstractResource.java
index d858d40..23a5782 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpAbstractResource.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpAbstractResource.java
@@ -158,6 +158,11 @@ public abstract class AmqpAbstractResource<R extends JmsResource, E extends Endp
             }
         }
 
+        if (closeTimeoutTask != null) {
+            closeTimeoutTask.cancel(true);
+            closeTimeoutTask = null;
+        }
+
         if (isAwaitingClose()) {
             LOG.debug("{} is now closed: ", this);
             if (cause == null) {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org