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 F09D49347 for ; Thu, 9 Aug 2012 18:42:27 +0000 (UTC) Received: (qmail 43049 invoked by uid 500); 9 Aug 2012 18:42:27 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 43015 invoked by uid 500); 9 Aug 2012 18:42:27 -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 43008 invoked by uid 99); 9 Aug 2012 18:42:27 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Aug 2012 18:42:27 +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; Thu, 09 Aug 2012 18:42:25 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6C13723888E3 for ; Thu, 9 Aug 2012 18:41:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1371368 - /activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Transport/InactivityMonitor.cs Date: Thu, 09 Aug 2012 18:41:41 -0000 To: commits@activemq.apache.org From: tabish@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120809184141.6C13723888E3@eris.apache.org> Author: tabish Date: Thu Aug 9 18:41:41 2012 New Revision: 1371368 URL: http://svn.apache.org/viewvc?rev=1371368&view=rev Log: https://issues.apache.org/jira/browse/AMQNET-384 small fix to inactivity monitor to ensure the read and write times are set correctly. Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Transport/InactivityMonitor.cs Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Transport/InactivityMonitor.cs URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Transport/InactivityMonitor.cs?rev=1371368&r1=1371367&r2=1371368&view=diff ============================================================================== --- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Transport/InactivityMonitor.cs (original) +++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Transport/InactivityMonitor.cs Thu Aug 9 18:41:41 2012 @@ -315,7 +315,7 @@ namespace Apache.NMS.Stomp.Transport { readCheckTime = Math.Max( - localWireFormatInfo.MaxInactivityDuration, + localWireFormatInfo.ReadCheckInterval, remoteWireFormatInfo.WriteCheckInterval); this.asyncErrorTask = new AsyncSignalReadErrorkTask(this, next.RemoteAddress); @@ -326,12 +326,12 @@ namespace Apache.NMS.Stomp.Transport if(remoteWireFormatInfo.Version > 1.0) { writeCheckTime = - Math.Max(localWireFormatInfo.MaxInactivityDuration, + Math.Max(localWireFormatInfo.WriteCheckInterval, remoteWireFormatInfo.ReadCheckInterval); } else { - writeCheckTime = localWireFormatInfo.MaxInactivityDuration; + writeCheckTime = localWireFormatInfo.WriteCheckInterval; } this.asyncWriteTask = new AsyncWriteTask(this);