You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by tr...@apache.org on 2007/09/17 15:44:39 UTC
svn commit: r576434 - in /mina/trunk/core/src/main/java/org/apache/mina:
common/ transport/socket/nio/ transport/vmpipe/
Author: trustin
Date: Mon Sep 17 06:44:38 2007
New Revision: 576434
URL: http://svn.apache.org/viewvc?rev=576434&view=rev
Log:
Improved AbstractIoAcceptor to call IoServiceListenerSupport.fireService(De)Activated().
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoAcceptor.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoAcceptor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoAcceptor.java?rev=576434&r1=576433&r2=576434&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoAcceptor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoAcceptor.java Mon Sep 17 06:44:38 2007
@@ -102,6 +102,7 @@
}
bound = true;
}
+ getListeners().fireServiceActivated();
}
public final void unbind() {
@@ -120,6 +121,8 @@
}
bound = false;
}
+
+ getListeners().fireServiceDeactivated();
}
public boolean isBound() {
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java?rev=576434&r1=576433&r2=576434&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java Mon Sep 17 06:44:38 2007
@@ -362,7 +362,6 @@
ch.register(selector, SelectionKey.OP_READ, future);
this.channel = ch;
- getListeners().fireServiceActivated();
future.setDone();
} catch (Exception e) {
future.setException(e);
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java?rev=576434&r1=576433&r2=576434&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java Mon Sep 17 06:44:38 2007
@@ -36,7 +36,6 @@
import org.apache.mina.common.AbstractIoAcceptor;
import org.apache.mina.common.ExceptionMonitor;
import org.apache.mina.common.IoAcceptor;
-import org.apache.mina.common.IoServiceListenerSupport;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.RuntimeIOException;
import org.apache.mina.common.TransportMetadata;
@@ -447,7 +446,6 @@
serverSocketChannel = ssc;
// and notify.
- getListeners().fireServiceActivated();
future.setDone();
} catch (Exception e) {
future.setException(e);
@@ -489,7 +487,6 @@
ExceptionMonitor.getInstance().exceptionCaught(e);
} finally {
future.setDone();
- getListeners().fireServiceDeactivated();
}
}
}
@@ -499,10 +496,5 @@
*/
public IoSession newSession(SocketAddress remoteAddress) {
throw new UnsupportedOperationException();
- }
-
- @Override
- protected IoServiceListenerSupport getListeners() {
- return super.getListeners();
}
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java?rev=576434&r1=576433&r2=576434&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java Mon Sep 17 06:44:38 2007
@@ -31,12 +31,11 @@
import java.util.concurrent.Executor;
import org.apache.mina.common.AbstractIoConnector;
-import org.apache.mina.common.DefaultIoFilterChain;
import org.apache.mina.common.ConnectFuture;
import org.apache.mina.common.DefaultConnectFuture;
+import org.apache.mina.common.DefaultIoFilterChain;
import org.apache.mina.common.ExceptionMonitor;
import org.apache.mina.common.IoConnector;
-import org.apache.mina.common.IoServiceListenerSupport;
import org.apache.mina.common.RuntimeIOException;
import org.apache.mina.common.TransportMetadata;
import org.apache.mina.util.NamePreservingRunnable;
@@ -349,10 +348,5 @@
this.deadline = System.currentTimeMillis()
+ getConnectTimeoutMillis();
}
- }
-
- @Override
- protected IoServiceListenerSupport getListeners() {
- return super.getListeners();
}
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java?rev=576434&r1=576433&r2=576434&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java Mon Sep 17 06:44:38 2007
@@ -97,7 +97,6 @@
}
setLocalAddress(localAddress);
- getListeners().fireServiceActivated();
}
@Override