Author: trustin
Date: Mon Dec 3 02:02:19 2007
New Revision: 600463
URL: http://svn.apache.org/viewvc?rev=600463&view=rev
Log:
Renamed unbindAll() to unbind() - unbind() has too ambiguous meaning. It's
just better to unbind all addressed.
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoAcceptor.java
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractPollingConnectionlessIoAcceptor.java
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractPollingIoAcceptor.java
mina/trunk/core/src/main/java/org/apache/mina/common/IoAcceptor.java
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java
mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramConfigTest.java
mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramRecyclerTest.java
mina/trunk/example/src/main/java/org/apache/mina/example/tennis/Main.java
mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.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=600463&r1=600462&r2=600463&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 Dec 3 02:02:19 2007
@@ -214,11 +214,7 @@
}
public final void unbind() {
- if (getDefaultLocalAddress() == null) {
- throw new IllegalStateException(
- "defaultLocalAddress is null (i.e. any).");
- }
- unbind(getDefaultLocalAddresses());
+ unbind(getLocalAddresses());
}
public final void unbind(SocketAddress localAddress) {
@@ -244,10 +240,6 @@
localAddresses.add(firstLocalAddress);
Collections.addAll(localAddresses, otherLocalAddresses);
unbind(localAddresses);
- }
-
- public final void unbindAll() {
- unbind(getLocalAddresses());
}
public final void unbind(Iterable<? extends SocketAddress> localAddresses)
{
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractPollingConnectionlessIoAcceptor.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/AbstractPollingConnectionlessIoAcceptor.java?rev=600463&r1=600462&r2=600463&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractPollingConnectionlessIoAcceptor.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractPollingConnectionlessIoAcceptor.java
Mon Dec 3 02:02:19 2007
@@ -132,7 +132,7 @@
@Override
protected IoFuture dispose0() throws Exception {
- unbindAll();
+ unbind();
if (!disposalFuture.isDone()) {
startupWorker();
wakeup();
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractPollingIoAcceptor.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/AbstractPollingIoAcceptor.java?rev=600463&r1=600462&r2=600463&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractPollingIoAcceptor.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractPollingIoAcceptor.java
Mon Dec 3 02:02:19 2007
@@ -138,7 +138,7 @@
@Override
protected IoFuture dispose0() throws Exception {
- unbindAll();
+ unbind();
if (!disposalFuture.isDone()) {
startupWorker();
wakeup();
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/IoAcceptor.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/IoAcceptor.java?rev=600463&r1=600462&r2=600463&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/IoAcceptor.java
(original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/IoAcceptor.java Mon
Dec 3 02:02:19 2007
@@ -138,11 +138,11 @@
void bind(Iterable<? extends SocketAddress> localAddresses) throws
IOException;
/**
- * Unbinds from the default local address(es) and stop to accept incoming
- * connections. All managed connections will be closed if
- * [EMAIL PROTECTED] #setDisconnectOnUnbind(boolean) disconnectOnUnbind}
property is
- * <tt>true</tt>. This method returns silently if the default local
- * address(es) are not bound yet.
+ * Unbinds from all local addresses that this service is bound to and stops
+ * to accept incoming connections. All managed connections will be closed
+ * if [EMAIL PROTECTED] #setDisconnectOnUnbind(boolean)
disconnectOnUnbind} property
+ * is <tt>true</tt>. This method returns silently if no local address is
+ * bound yet.
*/
void unbind();
@@ -173,15 +173,6 @@
*/
void unbind(Iterable<? extends SocketAddress> localAddresses);
- /**
- * Unbinds from all local addresses that this service is bound to and stops
- * to accept incoming connections. All managed connections will be closed
- * if [EMAIL PROTECTED] #setDisconnectOnUnbind(boolean)
disconnectOnUnbind} property
- * is <tt>true</tt>. This method returns silently if no local address is
- * bound yet.
- */
- void unbindAll();
-
/**
* (Optional) Returns an [EMAIL PROTECTED] IoSession} that is bound to the
specified
* <tt>localAddress</tt> and the specified <tt>remoteAddress</tt> which
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=600463&r1=600462&r2=600463&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 Dec 3 02:02:19 2007
@@ -78,7 +78,7 @@
@Override
protected IoFuture dispose0() throws Exception {
- unbindAll();
+ unbind();
return null;
}
Modified:
mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramConfigTest.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramConfigTest.java?rev=600463&r1=600462&r2=600463&view=diff
==============================================================================
---
mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramConfigTest.java
(original)
+++
mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramConfigTest.java
Mon Dec 3 02:02:19 2007
@@ -94,7 +94,7 @@
Assert.assertEquals("FH", result);
} finally {
- acceptor.unbindAll();
+ acceptor.unbind();
}
}
Modified:
mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramRecyclerTest.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramRecyclerTest.java?rev=600463&r1=600462&r2=600463&view=diff
==============================================================================
---
mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramRecyclerTest.java
(original)
+++
mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramRecyclerTest.java
Mon Dec 3 02:02:19 2007
@@ -103,7 +103,7 @@
Assert.assertEquals("CROPSECL",
connectorHandler.result.toString());
Assert.assertEquals("CROPRECL", acceptorHandler.result.toString());
} finally {
- acceptor.unbindAll();
+ acceptor.unbind();
}
}
@@ -166,7 +166,7 @@
Assert.assertNotSame(oldSession, acceptorHandler.session);
} finally {
- acceptor.unbindAll();
+ acceptor.unbind();
}
}
Modified:
mina/trunk/example/src/main/java/org/apache/mina/example/tennis/Main.java
URL:
http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/tennis/Main.java?rev=600463&r1=600462&r2=600463&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/tennis/Main.java
(original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/tennis/Main.java
Mon Dec 3 02:02:19 2007
@@ -63,6 +63,6 @@
// Wait until the match ends.
session.getCloseFuture().awaitUninterruptibly();
- acceptor.unbindAll();
+ acceptor.unbind();
}
}
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=600463&r1=600462&r2=600463&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
Mon Dec 3 02:02:19 2007
@@ -155,10 +155,10 @@
} catch (IOException e) {
} finally {
if (socketBound && !datagramBound) {
- socketAcceptor.unbindAll();
+ socketAcceptor.unbind();
}
if (datagramBound && !socketBound) {
- datagramAcceptor.unbindAll();
+ datagramAcceptor.unbind();
}
}
}
