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/11/11 15:32:43 UTC
svn commit: r593889 - in /mina/trunk:
core/src/main/java/org/apache/mina/common/
core/src/main/java/org/apache/mina/transport/socket/nio/
transport-serial/src/main/java/org/apache/mina/transport/serial/
Author: trustin
Date: Sun Nov 11 06:32:43 2007
New Revision: 593889
URL: http://svn.apache.org/viewvc?rev=593889&view=rev
Log:
* Made sure IoService operations fail once it's disposed.
* Removed unnecessary sanity check in SerialConnector
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoAcceptor.java
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoConnector.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramAcceptor.java
mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialConnector.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=593889&r1=593888&r2=593889&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 Sun Nov 11 06:32:43 2007
@@ -120,6 +120,10 @@
}
public final void bind() throws IOException {
+ if (isDisposed()) {
+ throw new IllegalStateException("Already disposed.");
+ }
+
synchronized (bindLock) {
if (bound) {
throw new IllegalStateException("Already bound to: "
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoConnector.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoConnector.java?rev=593889&r1=593888&r2=593889&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoConnector.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoConnector.java Sun Nov 11 06:32:43 2007
@@ -58,6 +58,10 @@
public final ConnectFuture connect(SocketAddress remoteAddress,
SocketAddress localAddress) {
+ if (isDisposed()) {
+ throw new IllegalStateException("Already disposed.");
+ }
+
if (remoteAddress == null) {
throw new NullPointerException("remoteAddress");
}
@@ -97,6 +101,7 @@
* related with event notifications to the specified {@code session}
* and {@code future}.
*/
+ @Override
protected void finishSessionInitialization(
final IoSession session, IoFuture future) {
super.finishSessionInitialization(session, future);
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramAcceptor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramAcceptor.java?rev=593889&r1=593888&r2=593889&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramAcceptor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramAcceptor.java Sun Nov 11 06:32:43 2007
@@ -173,6 +173,10 @@
}
public IoSession newSession(SocketAddress remoteAddress, SocketAddress localAddress) {
+ if (isDisposed()) {
+ throw new IllegalStateException("Already disposed.");
+ }
+
if (remoteAddress == null) {
throw new NullPointerException("remoteAddress");
}
Modified: mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialConnector.java
URL: http://svn.apache.org/viewvc/mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialConnector.java?rev=593889&r1=593888&r2=593889&view=diff
==============================================================================
--- mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialConnector.java (original)
+++ mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialConnector.java Sun Nov 11 06:32:43 2007
@@ -60,10 +60,6 @@
@Override
protected ConnectFuture doConnect(SocketAddress remoteAddress,
SocketAddress localAddress) {
- if (!(remoteAddress instanceof SerialAddress)) {
- throw new IllegalArgumentException(
- "Bad SocketAddress, need a SerialPortAddress");
- }
CommPortIdentifier portId;
Enumeration<?> portList = CommPortIdentifier.getPortIdentifiers();