[jboss-cvs] JBoss Messaging SVN: r7552 - trunk/tests/src/org/jboss/messaging/tests/integration/http.

[jboss-cvs-commits at lists.jboss.org]

Author: jmesnil
Date: 2009-07-09 11:55:07 -0400 (Thu, 09 Jul 2009)
New Revision: 7552

Modified:
   trunk/tests/src/org/jboss/messaging/tests/integration/http/NettyHttpTest.java
Log:
reverted to r7546 now that HTTP timer tasks are properly cancelled

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/http/NettyHttpTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/http/NettyHttpTest.java	2009-07-09 14:39:05 UTC (rev 7551)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/http/NettyHttpTest.java	2009-07-09 15:55:07 UTC (rev 7552)
@@ -21,8 +21,6 @@
  */
 package org.jboss.messaging.tests.integration.http;
 
-import java.io.IOException;
-import java.net.ServerSocket;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.concurrent.CountDownLatch;
@@ -51,26 +49,15 @@
    private NettyConnector connector;
    
    private ExecutorService threadPool;
-
-   private int port;
-
-   private static int findFreePort() throws IOException
-   {
-      ServerSocket server = new ServerSocket(0);
-      server.setReuseAddress(true);
-      int port = server.getLocalPort();
-      server.close();
-      return port;
-   }
    
    @Override
    protected void setUp() throws Exception
    {
       super.setUp();
       
+      checkFreePort(TransportConstants.DEFAULT_PORT);
+
       threadPool = Executors.newCachedThreadPool();
-      
-      port = findFreePort();
    }
    
    @Override
@@ -89,6 +76,8 @@
       
       threadPool.shutdownNow();
 
+      checkFreePort(TransportConstants.DEFAULT_PORT);
+
       super.tearDown();
    }
    
@@ -103,7 +92,6 @@
       HashMap<String, Object> conf = new HashMap<String, Object>();
       conf.put(TransportConstants.HTTP_ENABLED_PROP_NAME, true);
       conf.put(TransportConstants.HTTP_CLIENT_IDLE_SCAN_PERIOD, -1l);
-      conf.put(TransportConstants.PORT_PROP_NAME, port);
       DummyConnectionLifeCycleListener acceptorListener = new DummyConnectionLifeCycleListener(connCreatedLatch);
       SimpleBufferHandler acceptorHandler = new SimpleBufferHandler(acceptorLatch);
       acceptor = new NettyAcceptor(conf, acceptorHandler, acceptorListener, threadPool);
@@ -154,7 +142,6 @@
       HashMap<String, Object> conf = new HashMap<String, Object>();
       conf.put(TransportConstants.HTTP_ENABLED_PROP_NAME, true);
       conf.put(TransportConstants.HTTP_CLIENT_IDLE_SCAN_PERIOD, -1l);
-      conf.put(TransportConstants.PORT_PROP_NAME, port);
       DummyConnectionLifeCycleListener acceptorListener = new DummyConnectionLifeCycleListener(connCreatedLatch);
       SimpleBufferHandler acceptorHandler = new SimpleBufferHandler(acceptorLatch);
       acceptor = new NettyAcceptor(conf, acceptorHandler, acceptorListener, threadPool);
@@ -208,7 +195,6 @@
       HashMap<String, Object> conf = new HashMap<String, Object>();
       conf.put(TransportConstants.HTTP_ENABLED_PROP_NAME, true);
       conf.put(TransportConstants.HTTP_CLIENT_IDLE_SCAN_PERIOD, -1l);
-      conf.put(TransportConstants.PORT_PROP_NAME, port);
       DummyConnectionLifeCycleListener acceptorListener = new DummyConnectionLifeCycleListener(connCreatedLatch);
       SimpleBufferHandler acceptorHandler = new SimpleBufferHandler(acceptorLatch);
       acceptor = new NettyAcceptor(conf, acceptorHandler, acceptorListener, threadPool);
@@ -263,7 +249,6 @@
       HashMap<String, Object> conf = new HashMap<String, Object>();
       conf.put(TransportConstants.HTTP_ENABLED_PROP_NAME, true);
       conf.put(TransportConstants.HTTP_CLIENT_IDLE_SCAN_PERIOD, -1l);
-      conf.put(TransportConstants.PORT_PROP_NAME, port);
       DummyConnectionLifeCycleListener acceptorListener = new DummyConnectionLifeCycleListener(connCreatedLatch);
       SimpleBufferHandler acceptorHandler = new SimpleBufferHandler(acceptorLatch);
       acceptor = new NettyAcceptor(conf, acceptorHandler, acceptorListener, threadPool);
@@ -317,7 +302,6 @@
       conf.put(TransportConstants.HTTP_ENABLED_PROP_NAME, true);
       conf.put(TransportConstants.HTTP_CLIENT_IDLE_SCAN_PERIOD, 500l);
       conf.put(TransportConstants.HTTP_CLIENT_IDLE_PROP_NAME, 500l);
-      conf.put(TransportConstants.PORT_PROP_NAME, port);
       DummyConnectionLifeCycleListener acceptorListener = new DummyConnectionLifeCycleListener(connCreatedLatch);
       SimpleBufferHandler acceptorHandler = new SimpleBufferHandler(acceptorLatch);
       acceptor = new NettyAcceptor(conf, acceptorHandler, acceptorListener, threadPool);
@@ -367,7 +351,6 @@
       conf.put(TransportConstants.HTTP_CLIENT_IDLE_SCAN_PERIOD, -1l);
       conf.put(TransportConstants.HTTP_RESPONSE_TIME_PROP_NAME, 500l);
       conf.put(TransportConstants.HTTP_SERVER_SCAN_PERIOD_PROP_NAME, 5000l);
-      conf.put(TransportConstants.PORT_PROP_NAME, port);
       DummyConnectionLifeCycleListener acceptorListener = new DummyConnectionLifeCycleListener(connCreatedLatch);
       SimpleBufferHandler acceptorHandler = new SimpleBufferHandler(acceptorLatch);
       acceptor = new NettyAcceptor(conf, acceptorHandler, acceptorListener, threadPool);
@@ -410,7 +393,6 @@
       conf.put(TransportConstants.HTTP_CLIENT_IDLE_SCAN_PERIOD, -1l);
       conf.put(TransportConstants.HTTP_RESPONSE_TIME_PROP_NAME, 500l);
       conf.put(TransportConstants.HTTP_SERVER_SCAN_PERIOD_PROP_NAME, 5000l);
-      conf.put(TransportConstants.PORT_PROP_NAME, port);
       DummyConnectionLifeCycleListener acceptorListener = new DummyConnectionLifeCycleListener(connCreatedLatch);
       SimpleBufferHandler2 acceptorHandler = new SimpleBufferHandler2(acceptorLatch);
       acceptor = new NettyAcceptor(conf, acceptorHandler, acceptorListener, threadPool);