You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2008/06/19 19:25:38 UTC
svn commit: r669579 -
/mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java
Author: elecharny
Date: Thu Jun 19 10:25:38 2008
New Revision: 669579
URL: http://svn.apache.org/viewvc?rev=669579&view=rev
Log:
Remove the loop and replaced it by a direct call to AvailablePortFinder.getnextPort(1024). The first port is not anymore 1, as it's very unlikely that a user launches the tests as root...
Modified:
mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java
Modified: mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java?rev=669579&r1=669578&r2=669579&view=diff
==============================================================================
--- mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java (original)
+++ mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java Thu Jun 19 10:25:38 2008
@@ -33,6 +33,7 @@
import org.apache.mina.transport.socket.DatagramSessionConfig;
import org.apache.mina.transport.socket.nio.NioDatagramAcceptor;
import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
+import org.apache.mina.util.AvailablePortFinder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -94,7 +95,7 @@
.setReuseAddress(true);
((NioSocketAcceptor) socketAcceptor).setReuseAddress(true);
- // Find an availble test port and bind to it.
+ // Find an available test port and bind to it.
boolean socketBound = false;
boolean datagramBound = false;
@@ -104,65 +105,65 @@
SocketAddress address = null;
- for (port = 1; port <= 65535; port++) {
- socketBound = false;
- datagramBound = false;
-
- address = new InetSocketAddress(port);
-
- try {
- socketAcceptor.setHandler(new EchoProtocolHandler() {
- @Override
- public void sessionCreated(IoSession session) {
- if (useSSL) {
- session.getFilterChain().addFirst("SSL", sslFilter);
- }
+ // Find the first available port above 1024
+ port = AvailablePortFinder.getNextAvailable(1024);
+
+ socketBound = false;
+ datagramBound = false;
+
+ address = new InetSocketAddress(port);
+
+ try {
+ socketAcceptor.setHandler(new EchoProtocolHandler() {
+ @Override
+ public void sessionCreated(IoSession session) {
+ if (useSSL) {
+ session.getFilterChain().addFirst("SSL", sslFilter);
+ }
+ }
+
+ // This is for TLS re-entrance test
+ @Override
+ public void messageReceived(IoSession session,
+ Object message) throws Exception {
+ if (!(message instanceof IoBuffer)) {
+ return;
}
- // This is for TLS reentrance test
- @Override
- public void messageReceived(IoSession session,
- Object message) throws Exception {
- if (!(message instanceof IoBuffer)) {
- return;
- }
-
- IoBuffer buf = (IoBuffer) message;
- if (session.getFilterChain().contains("SSL")
- && buf.remaining() == 1
- && buf.get() == (byte) '.') {
- logger.info("TLS Reentrance");
- ((SslFilter) session.getFilterChain().get("SSL"))
- .startSsl(session);
-
- // Send a response
- buf = IoBuffer.allocate(1);
- buf.put((byte) '.');
- buf.flip();
- session
- .setAttribute(SslFilter.DISABLE_ENCRYPTION_ONCE);
- session.write(buf);
- } else {
- super.messageReceived(session, message);
- }
+ IoBuffer buf = (IoBuffer) message;
+ if (session.getFilterChain().contains("SSL")
+ && buf.remaining() == 1
+ && buf.get() == (byte) '.') {
+ logger.info("TLS Reentrance");
+ ((SslFilter) session.getFilterChain().get("SSL"))
+ .startSsl(session);
+
+ // Send a response
+ buf = IoBuffer.allocate(1);
+ buf.put((byte) '.');
+ buf.flip();
+ session
+ .setAttribute(SslFilter.DISABLE_ENCRYPTION_ONCE);
+ session.write(buf);
+ } else {
+ super.messageReceived(session, message);
}
- });
+ }
+ });
socketAcceptor.bind(address);
socketBound = true;
datagramAcceptor.setHandler(new EchoProtocolHandler());
datagramAcceptor.bind(address);
datagramBound = true;
-
- break;
- } catch (IOException e) {
- } finally {
- if (socketBound && !datagramBound) {
- socketAcceptor.unbind();
- }
- if (datagramBound && !socketBound) {
- datagramAcceptor.unbind();
- }
+ } catch (IOException e) {
+ // Do nothing
+ } finally {
+ if (socketBound && !datagramBound) {
+ socketAcceptor.unbind();
+ }
+ if (datagramBound && !socketBound) {
+ datagramAcceptor.unbind();
}
}