Return-Path: Delivered-To: apmail-incubator-qpid-commits-archive@locus.apache.org Received: (qmail 38096 invoked from network); 2 Dec 2008 23:26:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Dec 2008 23:26:49 -0000 Received: (qmail 11910 invoked by uid 500); 2 Dec 2008 23:27:01 -0000 Delivered-To: apmail-incubator-qpid-commits-archive@incubator.apache.org Received: (qmail 11872 invoked by uid 500); 2 Dec 2008 23:27:01 -0000 Mailing-List: contact qpid-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: qpid-dev@incubator.apache.org Delivered-To: mailing list qpid-commits@incubator.apache.org Received: (qmail 11863 invoked by uid 99); 2 Dec 2008 23:27:01 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Dec 2008 15:27:01 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Tue, 02 Dec 2008 23:25:41 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CFBEA238896E; Tue, 2 Dec 2008 15:25:58 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r722669 - in /incubator/qpid/trunk/qpid/java/common/src: main/java/org/apache/qpid/transport/network/io/IoAcceptor.java test/java/org/apache/qpid/transport/ConnectionTest.java Date: Tue, 02 Dec 2008 23:25:58 -0000 To: qpid-commits@incubator.apache.org From: ritchiem@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081202232558.CFBEA238896E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ritchiem Date: Tue Dec 2 15:25:58 2008 New Revision: 722669 URL: http://svn.apache.org/viewvc?rev=722669&view=rev Log: QPID-1499 : Modification to IoAcceptor so ConnectionTest can close the open SocketServer. Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoAcceptor.java incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoAcceptor.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoAcceptor.java?rev=722669&r1=722668&r2=722669&view=diff ============================================================================== --- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoAcceptor.java (original) +++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoAcceptor.java Tue Dec 2 15:25:58 2008 @@ -56,6 +56,17 @@ setName(String.format("IoAcceptor - %s", socket.getInetAddress())); } + /** + Close the underlying ServerSocket if it has not already been closed. + */ + public void close() throws IOException + { + if (!socket.isClosed()) + { + socket.close(); + } + } + public IoAcceptor(String host, int port, Binding binding) throws IOException { Modified: incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java?rev=722669&r1=722668&r2=722669&view=diff ============================================================================== --- incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java (original) +++ incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java Tue Dec 2 15:25:58 2008 @@ -26,7 +26,6 @@ import org.apache.qpid.transport.network.ConnectionBinding; import org.apache.qpid.transport.network.io.IoAcceptor; -import org.apache.qpid.transport.network.io.IoTransport; import org.apache.qpid.transport.util.Logger; import org.apache.qpid.transport.util.Waiter; @@ -34,7 +33,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.Random; import java.util.Collections; import java.io.IOException; @@ -52,12 +50,20 @@ private List messages = new ArrayList(); private List incoming = new ArrayList(); + private IoAcceptor _ioa = null; + + protected void setUp() throws Exception { super.setUp(); port = AvailablePortFinder.getNextAvailable(12000); + } + protected void tearDown() throws Exception + { + _ioa.close(); + super.tearDown(); } public void opened(Session ssn) {} @@ -206,11 +212,9 @@ } }; - IoAcceptor ioa = null; try { - ioa = new IoAcceptor - ("localhost", port, ConnectionBinding.get(server)); + _ioa = new IoAcceptor("localhost", port, ConnectionBinding.get(server)); } catch (IOException e) { @@ -218,7 +222,7 @@ fail("Unable to start Server for test due to:" + e.getMessage()); } - ioa.start(); + _ioa.start(); } public void testClosedNotificationAndWriteToClosed() throws Exception