From activemq-commits-return-940-apmail-geronimo-activemq-commits-archive=geronimo.apache.org@geronimo.apache.org Sun Mar 05 13:21:12 2006 Return-Path: Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org Received: (qmail 55335 invoked from network); 5 Mar 2006 13:21:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 5 Mar 2006 13:21:12 -0000 Received: (qmail 30827 invoked by uid 500); 5 Mar 2006 13:21:58 -0000 Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org Received: (qmail 30798 invoked by uid 500); 5 Mar 2006 13:21:58 -0000 Mailing-List: contact activemq-commits-help@geronimo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: activemq-dev@geronimo.apache.org Delivered-To: mailing list activemq-commits@geronimo.apache.org Received: (qmail 30789 invoked by uid 99); 5 Mar 2006 13:21:58 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 05 Mar 2006 05:21:58 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Sun, 05 Mar 2006 05:21:57 -0800 Received: (qmail 55291 invoked by uid 65534); 5 Mar 2006 13:20:50 -0000 Message-ID: <20060305132050.55289.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r383315 - in /incubator/activemq/trunk/openwire-dotnet: src/ActiveMQ/Transport/Tcp/TcpTransport.cs tests/JMS/JMSTestSupport.cs Date: Sun, 05 Mar 2006 13:20:49 -0000 To: activemq-commits@geronimo.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.7 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: chirino Date: Sun Mar 5 05:20:48 2006 New Revision: 383315 URL: http://svn.apache.org/viewcvs?rev=383315&view=rev Log: Don't report errors if the transport is being closed. Modified: incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Transport/Tcp/TcpTransport.cs incubator/activemq/trunk/openwire-dotnet/tests/JMS/JMSTestSupport.cs Modified: incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Transport/Tcp/TcpTransport.cs URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Transport/Tcp/TcpTransport.cs?rev=383315&r1=383314&r2=383315&view=diff ============================================================================== --- incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Transport/Tcp/TcpTransport.cs (original) +++ incubator/activemq/trunk/openwire-dotnet/src/ActiveMQ/Transport/Tcp/TcpTransport.cs Sun Mar 5 05:20:48 2006 @@ -114,9 +114,19 @@ { break; } + catch ( IOException e) { + if( e.GetBaseException() is ObjectDisposedException ) { + break; + } + if( !closed ) { + this.exceptionHandler(this,e); + } + } catch (Exception e) { - this.exceptionHandler(this,e); + if( !closed ) { + this.exceptionHandler(this,e); + } } } } Modified: incubator/activemq/trunk/openwire-dotnet/tests/JMS/JMSTestSupport.cs URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/tests/JMS/JMSTestSupport.cs?rev=383315&r1=383314&r2=383315&view=diff ============================================================================== --- incubator/activemq/trunk/openwire-dotnet/tests/JMS/JMSTestSupport.cs (original) +++ incubator/activemq/trunk/openwire-dotnet/tests/JMS/JMSTestSupport.cs Sun Mar 5 05:20:48 2006 @@ -65,10 +65,10 @@ { if (connection != null) { - Console.WriteLine("Disconnectting..."); + Console.WriteLine("Disconnecting..."); connection.Dispose(); connection = null; - Console.WriteLine("Disconnectted."); + Console.WriteLine("Disconnected."); } }