You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2014/11/03 22:00:20 UTC
[1/2] git commit: Changed the log message from 'disposed' to 'being
disposed' for clarity
Repository: mina
Updated Branches:
refs/heads/2.0 d56e27f6b -> 8a68414a7
Changed the log message from 'disposed' to 'being disposed' for clarity
Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/a54ac5c5
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/a54ac5c5
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/a54ac5c5
Branch: refs/heads/2.0
Commit: a54ac5c54ad5a62eec9a7c524d9761e3847f3399
Parents: d56e27f
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Mon Nov 3 07:34:08 2014 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Mon Nov 3 07:34:08 2014 +0100
----------------------------------------------------------------------
.../main/java/org/apache/mina/core/service/AbstractIoAcceptor.java | 2 +-
.../java/org/apache/mina/core/service/AbstractIoConnector.java | 2 +-
.../org/apache/mina/transport/socket/nio/NioDatagramAcceptor.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina/blob/a54ac5c5/mina-core/src/main/java/org/apache/mina/core/service/AbstractIoAcceptor.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/core/service/AbstractIoAcceptor.java b/mina-core/src/main/java/org/apache/mina/core/service/AbstractIoAcceptor.java
index 9f3af26..39df3e5 100644
--- a/mina-core/src/main/java/org/apache/mina/core/service/AbstractIoAcceptor.java
+++ b/mina-core/src/main/java/org/apache/mina/core/service/AbstractIoAcceptor.java
@@ -267,7 +267,7 @@ public abstract class AbstractIoAcceptor extends AbstractIoService implements Io
*/
public final void bind(Iterable<? extends SocketAddress> localAddresses) throws IOException {
if (isDisposing()) {
- throw new IllegalStateException("Already disposed.");
+ throw new IllegalStateException("The Accpetor disposed is being disposed.");
}
if (localAddresses == null) {
http://git-wip-us.apache.org/repos/asf/mina/blob/a54ac5c5/mina-core/src/main/java/org/apache/mina/core/service/AbstractIoConnector.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/core/service/AbstractIoConnector.java b/mina-core/src/main/java/org/apache/mina/core/service/AbstractIoConnector.java
index b76c8b7..bad1954 100644
--- a/mina-core/src/main/java/org/apache/mina/core/service/AbstractIoConnector.java
+++ b/mina-core/src/main/java/org/apache/mina/core/service/AbstractIoConnector.java
@@ -210,7 +210,7 @@ public abstract class AbstractIoConnector extends AbstractIoService implements I
public final ConnectFuture connect(SocketAddress remoteAddress, SocketAddress localAddress,
IoSessionInitializer<? extends ConnectFuture> sessionInitializer) {
if (isDisposing()) {
- throw new IllegalStateException("The connector has been disposed.");
+ throw new IllegalStateException("The connector is being disposed.");
}
if (remoteAddress == null) {
http://git-wip-us.apache.org/repos/asf/mina/blob/a54ac5c5/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramAcceptor.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramAcceptor.java b/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramAcceptor.java
index 4e912a9..411f9ec 100644
--- a/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramAcceptor.java
+++ b/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramAcceptor.java
@@ -667,7 +667,7 @@ public final class NioDatagramAcceptor extends AbstractIoAcceptor implements Dat
*/
public final IoSession newSession(SocketAddress remoteAddress, SocketAddress localAddress) {
if (isDisposing()) {
- throw new IllegalStateException("Already disposed.");
+ throw new IllegalStateException("The Acceptor is being disposed.");
}
if (remoteAddress == null) {
[2/2] git commit: Added the missing Javadoc
Posted by el...@apache.org.
Added the missing Javadoc
Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/8a68414a
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/8a68414a
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/8a68414a
Branch: refs/heads/2.0
Commit: 8a68414a7af18ac3b53065b64bb7d9c89f1b255a
Parents: a54ac5c
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Mon Nov 3 21:55:34 2014 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Mon Nov 3 21:55:34 2014 +0100
----------------------------------------------------------------------
.../org/apache/mina/core/future/IoFuture.java | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina/blob/8a68414a/mina-core/src/main/java/org/apache/mina/core/future/IoFuture.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/core/future/IoFuture.java b/mina-core/src/main/java/org/apache/mina/core/future/IoFuture.java
index 7ada25c..519f85a 100644
--- a/mina-core/src/main/java/org/apache/mina/core/future/IoFuture.java
+++ b/mina-core/src/main/java/org/apache/mina/core/future/IoFuture.java
@@ -46,14 +46,19 @@ public interface IoFuture {
/**
* Wait for the asynchronous operation to complete with the specified timeout.
*
- * @return <tt>true</tt> if the operation is completed.
+ * @param timeout The maximum delay to wait before getting out
+ * @param unit the type of unit for the delay (seconds, minutes...)
+ * @return <tt>true</tt> if the operation is completed.
+ * @exception InterruptedException If the thread is interruped while waiting
*/
boolean await(long timeout, TimeUnit unit) throws InterruptedException;
/**
* Wait for the asynchronous operation to complete with the specified timeout.
*
+ * @param timeout The maximum milliseconds to wait before getting out
* @return <tt>true</tt> if the operation is completed.
+ * @exception InterruptedException If the thread is interruped while waiting
*/
boolean await(long timeoutMillis) throws InterruptedException;
@@ -70,6 +75,8 @@ public interface IoFuture {
* Wait for the asynchronous operation to complete with the specified timeout
* uninterruptibly.
*
+ * @param timeout The maximum delay to wait before getting out
+ * @param unit the type of unit for the delay (seconds, minutes...)
* @return <tt>true</tt> if the operation is completed.
*/
boolean awaitUninterruptibly(long timeout, TimeUnit unit);
@@ -78,6 +85,7 @@ public interface IoFuture {
* Wait for the asynchronous operation to complete with the specified timeout
* uninterruptibly.
*
+ * @param timeout The maximum milliseconds to wait before getting out
* @return <tt>true</tt> if the operation is finished.
*/
boolean awaitUninterruptibly(long timeoutMillis);
@@ -96,6 +104,8 @@ public interface IoFuture {
/**
* Returns if the asynchronous operation is completed.
+ *
+ * @return <tt>true</tt> if the operation is completed.
*/
boolean isDone();
@@ -103,12 +113,18 @@ public interface IoFuture {
* Adds an event <tt>listener</tt> which is notified when
* this future is completed. If the listener is added
* after the completion, the listener is directly notified.
+ *
+ * @param listener The listener to add
+ * @return the current IoFuture
*/
IoFuture addListener(IoFutureListener<?> listener);
/**
* Removes an existing event <tt>listener</tt> so it won't be notified when
* the future is completed.
+ *
+ * @param listener The listener to remove
+ * @return the current IoFuture
*/
IoFuture removeListener(IoFutureListener<?> listener);
}