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 2292B18FB3 for ; Wed, 10 Feb 2016 00:00:17 +0000 (UTC) Received: (qmail 55996 invoked by uid 500); 10 Feb 2016 00:00:17 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 55950 invoked by uid 500); 10 Feb 2016 00:00:17 -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 55940 invoked by uid 99); 10 Feb 2016 00:00:17 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Feb 2016 00:00:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E42B3E031B; Wed, 10 Feb 2016 00:00:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: clebertsuconic@apache.org To: commits@activemq.apache.org Message-Id: <39e58b7db33c40fb802d70fd5c2dd72f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: activemq-artemis git commit: ARTEMIS-388 fixing testsuite (the socket.bind not being closed was preventing other tests to run successfully) Date: Wed, 10 Feb 2016 00:00:16 +0000 (UTC) Repository: activemq-artemis Updated Branches: refs/heads/master 539971717 -> ece5d81e3 ARTEMIS-388 fixing testsuite (the socket.bind not being closed was preventing other tests to run successfully) Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/ece5d81e Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/ece5d81e Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/ece5d81e Branch: refs/heads/master Commit: ece5d81e3d835367927db9adec8f7ff5b654eab0 Parents: 5399717 Author: Clebert Suconic Authored: Tue Feb 9 18:59:14 2016 -0500 Committer: Clebert Suconic Committed: Tue Feb 9 18:59:47 2016 -0500 ---------------------------------------------------------------------- .../server/ActivationFailureListenerTest.java | 27 ++++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ece5d81e/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ActivationFailureListenerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ActivationFailureListenerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ActivationFailureListenerTest.java index 6732b7a..a43e2c8 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ActivationFailureListenerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ActivationFailureListenerTest.java @@ -37,16 +37,21 @@ public class ActivationFailureListenerTest extends ActiveMQTestBase { @Test public void simpleTest() throws Exception { Socket s = new Socket(); - s.bind(new InetSocketAddress("127.0.0.1", 61616)); - server = createServer(false, createDefaultNettyConfig()); - final CountDownLatch latch = new CountDownLatch(1); - server.registerActivationFailureListener(new ActivationFailureListener() { - @Override - public void activationFailed(Exception exception) { - latch.countDown(); - } - }); - server.start(); - assertTrue(latch.await(3000, TimeUnit.MILLISECONDS)); + try { + s.bind(new InetSocketAddress("127.0.0.1", 61616)); + server = createServer(false, createDefaultNettyConfig()); + final CountDownLatch latch = new CountDownLatch(1); + server.registerActivationFailureListener(new ActivationFailureListener() { + @Override + public void activationFailed(Exception exception) { + latch.countDown(); + } + }); + server.start(); + assertTrue(latch.await(3000, TimeUnit.MILLISECONDS)); + } + finally { + s.close(); + } } }