Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 959BF7E3A for ; Mon, 21 Nov 2011 23:17:39 +0000 (UTC) Received: (qmail 91785 invoked by uid 500); 21 Nov 2011 23:17:39 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 91758 invoked by uid 500); 21 Nov 2011 23:17:39 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 91751 invoked by uid 99); 21 Nov 2011 23:17:39 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Nov 2011 23:17:39 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Nov 2011 23:17:37 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 579AB23889B3 for ; Mon, 21 Nov 2011 23:17:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1204748 - /activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.5.x/src/main/csharp/Connection.cs Date: Mon, 21 Nov 2011 23:17:16 -0000 To: commits@activemq.apache.org From: tabish@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111121231716.579AB23889B3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tabish Date: Mon Nov 21 23:17:15 2011 New Revision: 1204748 URL: http://svn.apache.org/viewvc?rev=1204748&view=rev Log: fix for: https://issues.apache.org/jira/browse/AMQNET-352 Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.5.x/src/main/csharp/Connection.cs Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.5.x/src/main/csharp/Connection.cs URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.5.x/src/main/csharp/Connection.cs?rev=1204748&r1=1204747&r2=1204748&view=diff ============================================================================== --- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.5.x/src/main/csharp/Connection.cs (original) +++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.5.x/src/main/csharp/Connection.cs Mon Nov 21 23:17:15 2011 @@ -1014,8 +1014,12 @@ namespace Apache.NMS.ActiveMQ { Tracer.Debug("Connection: Transport has been Interrupted."); - this.transportInterruptionProcessingComplete = new CountDownLatch(dispatchers.Count); - if(Tracer.IsDebugEnabled) + // Ensure that if there's an advisory consumer we don't add it to the + // set of consumers that need interruption processing. + this.transportInterruptionProcessingComplete = + new CountDownLatch(dispatchers.Count - (this.advisoryConsumer != null ? 1 : 0)); + + if(Tracer.IsDebugEnabled) { Tracer.Debug("transport interrupted, dispatchers: " + dispatchers.Count); }