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/12/04 07:56:52 UTC
svn commit: r600807 - in /mina/trunk:
core/src/main/java/org/apache/mina/common/
core/src/test/java/org/apache/mina/common/
core/src/test/java/org/apache/mina/transport/vmpipe/
example/src/test/java/org/apache/mina/example/echoserver/ssl/
Author: trustin
Date: Mon Dec 3 22:56:50 2007
New Revision: 600807
URL: http://svn.apache.org/viewvc?rev=600807&view=rev
Log:
* Renamed disconnectOnUnbind to closeOnDeactivation to represent its real meaning - it doesn't disconnect but close and it doesn't close when unbind is called but the service is deactivated (i.e. all local addresses associated with the service are unbound.)
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoAcceptor.java
mina/trunk/core/src/main/java/org/apache/mina/common/IoAcceptor.java
mina/trunk/core/src/main/java/org/apache/mina/common/IoServiceListenerSupport.java
mina/trunk/core/src/test/java/org/apache/mina/common/IoServiceListenerSupportTest.java
mina/trunk/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeSessionCrossCommunicationTest.java
mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ssl/SslFilterTest.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=600807&r1=600806&r2=600807&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 22:56:50 2007
@@ -131,11 +131,11 @@
}
}
- public final boolean isDisconnectOnUnbind() {
+ public final boolean isCloseOnDeactivation() {
return disconnectOnUnbind;
}
- public final void setDisconnectOnUnbind(boolean disconnectClientsOnUnbind) {
+ public final void setCloseOnDeactivation(boolean disconnectClientsOnUnbind) {
this.disconnectOnUnbind = disconnectClientsOnUnbind;
}
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=600807&r1=600806&r2=600807&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 22:56:50 2007
@@ -94,16 +94,18 @@
void setDefaultLocalAddresses(Iterable<? extends SocketAddress> localAddresses);
/**
- * Returns <tt>true</tt> if and only if all clients are disconnected
- * when this acceptor unbinds the related local address.
+ * Returns <tt>true</tt> if and only if all clients are closed when this
+ * acceptor unbinds from all the related local address (i.e. when the
+ * service is deactivated).
*/
- boolean isDisconnectOnUnbind();
+ boolean isCloseOnDeactivation();
/**
- * Sets whether all clients are disconnected when this acceptor unbinds the
- * related local address. The default value is <tt>true</tt>.
+ * Sets whether all client sessions are closed when this acceptor unbinds
+ * from all the related local addresses (i.e. when the service is
+ * deactivated). The default value is <tt>true</tt>.
*/
- void setDisconnectOnUnbind(boolean disconnectOnUnbind);
+ void setCloseOnDeactivation(boolean closeOnDeactivation);
/**
* Binds to the default local address(es) and start to accept incoming
@@ -140,7 +142,7 @@
/**
* Unbinds from all local addresses that this service is bound to and stops
* to accept incoming connections. All managed connections will be closed
- * if {@link #setDisconnectOnUnbind(boolean) disconnectOnUnbind} property
+ * if {@link #setCloseOnDeactivation(boolean) disconnectOnUnbind} property
* is <tt>true</tt>. This method returns silently if no local address is
* bound yet.
*/
@@ -149,7 +151,7 @@
/**
* Unbinds from the specified local address and stop to accept incoming
* connections. All managed connections will be closed if
- * {@link #setDisconnectOnUnbind(boolean) disconnectOnUnbind} property is
+ * {@link #setCloseOnDeactivation(boolean) disconnectOnUnbind} property is
* <tt>true</tt>. This method returns silently if the default local
* address is not bound yet.
*/
@@ -158,7 +160,7 @@
/**
* Unbinds from the specified local addresses and stop to accept incoming
* connections. All managed connections will be closed if
- * {@link #setDisconnectOnUnbind(boolean) disconnectOnUnbind} property is
+ * {@link #setCloseOnDeactivation(boolean) disconnectOnUnbind} property is
* <tt>true</tt>. This method returns silently if the default local
* addresses are not bound yet.
*/
@@ -167,7 +169,7 @@
/**
* Unbinds from the specified local addresses and stop to accept incoming
* connections. All managed connections will be closed if
- * {@link #setDisconnectOnUnbind(boolean) disconnectOnUnbind} property is
+ * {@link #setCloseOnDeactivation(boolean) disconnectOnUnbind} property is
* <tt>true</tt>. This method returns silently if the default local
* addresses are not bound yet.
*/
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/IoServiceListenerSupport.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/IoServiceListenerSupport.java?rev=600807&r1=600806&r2=600807&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/IoServiceListenerSupport.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/IoServiceListenerSupport.java Mon Dec 3 22:56:50 2007
@@ -230,7 +230,7 @@
return;
}
- if (!((IoAcceptor) service).isDisconnectOnUnbind()) {
+ if (!((IoAcceptor) service).isCloseOnDeactivation()) {
return;
}
Modified: mina/trunk/core/src/test/java/org/apache/mina/common/IoServiceListenerSupportTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/common/IoServiceListenerSupportTest.java?rev=600807&r1=600806&r2=600807&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/common/IoServiceListenerSupportTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/common/IoServiceListenerSupportTest.java Mon Dec 3 22:56:50 2007
@@ -172,7 +172,7 @@
chainControl.reset();
listener.serviceDeactivated(acceptor);
- acceptorControl.expectAndReturn(acceptor.isDisconnectOnUnbind(), true);
+ acceptorControl.expectAndReturn(acceptor.isCloseOnDeactivation(), true);
listener.sessionDestroyed(session);
chain.fireFilterClose();
chain.fireSessionClosed();
Modified: mina/trunk/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeSessionCrossCommunicationTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeSessionCrossCommunicationTest.java?rev=600807&r1=600806&r2=600807&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeSessionCrossCommunicationTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeSessionCrossCommunicationTest.java Mon Dec 3 22:56:50 2007
@@ -141,7 +141,7 @@
}
}
- acceptor.setDisconnectOnUnbind(false);
+ acceptor.setCloseOnDeactivation(false);
acceptor.dispose();
}
}
Modified: mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ssl/SslFilterTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ssl/SslFilterTest.java?rev=600807&r1=600806&r2=600807&view=diff
==============================================================================
--- mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ssl/SslFilterTest.java (original)
+++ mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ssl/SslFilterTest.java Mon Dec 3 22:56:50 2007
@@ -36,7 +36,7 @@
@Override
protected void tearDown() throws Exception {
- acceptor.setDisconnectOnUnbind(true);
+ acceptor.setCloseOnDeactivation(true);
acceptor.dispose();
super.tearDown();
}