You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by jv...@apache.org on 2012/11/08 14:05:34 UTC
svn commit: r1407040 - in
/mina/mina/trunk/core/src/main/java/org/apache/mina: api/IoServer.java
session/AbstractIoSession.java transport/nio/NioTcpServer.java
transport/nio/NioUdpServer.java
Author: jvermillard
Date: Thu Nov 8 13:05:34 2012
New Revision: 1407040
URL: http://svn.apache.org/viewvc?rev=1407040&view=rev
Log:
fixed close events
Modified:
mina/mina/trunk/core/src/main/java/org/apache/mina/api/IoServer.java
mina/mina/trunk/core/src/main/java/org/apache/mina/session/AbstractIoSession.java
mina/mina/trunk/core/src/main/java/org/apache/mina/transport/nio/NioTcpServer.java
mina/mina/trunk/core/src/main/java/org/apache/mina/transport/nio/NioUdpServer.java
Modified: mina/mina/trunk/core/src/main/java/org/apache/mina/api/IoServer.java
URL: http://svn.apache.org/viewvc/mina/mina/trunk/core/src/main/java/org/apache/mina/api/IoServer.java?rev=1407040&r1=1407039&r2=1407040&view=diff
==============================================================================
--- mina/mina/trunk/core/src/main/java/org/apache/mina/api/IoServer.java (original)
+++ mina/mina/trunk/core/src/main/java/org/apache/mina/api/IoServer.java Thu Nov 8 13:05:34 2012
@@ -23,10 +23,11 @@ import java.io.IOException;
import java.net.SocketAddress;
/**
- *
+ *
* A network serer bound to a local addresse
+ *
* @author <a href="http://mina.apache.org">Apache MINA Project</a>
- *
+ *
*/
public interface IoServer extends IoService {
@@ -36,20 +37,25 @@ public interface IoServer extends IoServ
SocketAddress getBoundAddress();
/**
- * Binds to the specified local addresses and start to accept incoming
- * connections.
- *
- * @throws IOException
- * if failed to bind
+ * Binds to the specified local addresses and start to accept incoming connections.
+ *
+ * @throws IOException if failed to bind
*/
void bind(SocketAddress localAddress) throws IOException;
/**
- * Unbinds from the local addresses that this service is bound to and stops
- * to accept incoming connections. This method returns silently if no local
- * address is bound yet.
- * @throws IOException
- * if failed to unbind
+ * Binds the server to the specified port.
+ *
+ * @param port the local TCP port to bind.
+ * @throws IOException if failed to bind.
+ */
+ void bind(int port) throws IOException;
+
+ /**
+ * Unbinds from the local addresses that this service is bound to and stops to accept incoming connections. This
+ * method returns silently if no local address is bound yet.
+ *
+ * @throws IOException if failed to unbind
*/
void unbind() throws IOException;
Modified: mina/mina/trunk/core/src/main/java/org/apache/mina/session/AbstractIoSession.java
URL: http://svn.apache.org/viewvc/mina/mina/trunk/core/src/main/java/org/apache/mina/session/AbstractIoSession.java?rev=1407040&r1=1407039&r2=1407040&view=diff
==============================================================================
--- mina/mina/trunk/core/src/main/java/org/apache/mina/session/AbstractIoSession.java (original)
+++ mina/mina/trunk/core/src/main/java/org/apache/mina/session/AbstractIoSession.java Thu Nov 8 13:05:34 2012
@@ -618,6 +618,7 @@ public abstract class AbstractIoSession
state = SessionState.CLOSING;
if (immediately) {
channelClose();
+ processSessionClosed();
} else {
// flush this session the flushing code will close the session
flushWriteQueue();
Modified: mina/mina/trunk/core/src/main/java/org/apache/mina/transport/nio/NioTcpServer.java
URL: http://svn.apache.org/viewvc/mina/mina/trunk/core/src/main/java/org/apache/mina/transport/nio/NioTcpServer.java?rev=1407040&r1=1407039&r2=1407040&view=diff
==============================================================================
--- mina/mina/trunk/core/src/main/java/org/apache/mina/transport/nio/NioTcpServer.java (original)
+++ mina/mina/trunk/core/src/main/java/org/apache/mina/transport/nio/NioTcpServer.java Thu Nov 8 13:05:34 2012
@@ -20,6 +20,7 @@
package org.apache.mina.transport.nio;
import java.io.IOException;
+import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.nio.ByteBuffer;
import java.nio.channels.SelectionKey;
@@ -94,6 +95,14 @@ public class NioTcpServer extends Abstra
* {@inheritDoc}
*/
@Override
+ public void bind(final int port) throws IOException {
+ bind(new InetSocketAddress(port));
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
public synchronized void bind(final SocketAddress localAddress) throws IOException {
if (localAddress == null) {
// We should at least have one address to bind on
Modified: mina/mina/trunk/core/src/main/java/org/apache/mina/transport/nio/NioUdpServer.java
URL: http://svn.apache.org/viewvc/mina/mina/trunk/core/src/main/java/org/apache/mina/transport/nio/NioUdpServer.java?rev=1407040&r1=1407039&r2=1407040&view=diff
==============================================================================
--- mina/mina/trunk/core/src/main/java/org/apache/mina/transport/nio/NioUdpServer.java (original)
+++ mina/mina/trunk/core/src/main/java/org/apache/mina/transport/nio/NioUdpServer.java Thu Nov 8 13:05:34 2012
@@ -20,6 +20,7 @@
package org.apache.mina.transport.nio;
import java.io.IOException;
+import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.nio.ByteBuffer;
import java.nio.channels.DatagramChannel;
@@ -99,6 +100,14 @@ public class NioUdpServer extends Abstra
* {@inheritDoc}
*/
@Override
+ public void bind(final int port) throws IOException {
+ bind(new InetSocketAddress(port));
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
public void bind(final SocketAddress localAddress) throws IOException {
if (localAddress == null) {
// We should at least have one address to bind on