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/10/29 04:03:15 UTC
svn commit: r589474 - in
/mina/trunk/core/src/main/java/org/apache/mina/common:
AbstractIoService.java CompositeIoFuture.java IoUtil.java
MessageBroadcaster.java
Author: trustin
Date: Sun Oct 28 20:03:14 2007
New Revision: 589474
URL: http://svn.apache.org/viewvc?rev=589474&view=rev
Log:
* Renamed MessageBroadcaster to IoUtil
** IoUtil.await can wait for any IoFuture now, and that's why I renamed MessageBroadcaster. We could add more utility method there in the future.
Added:
mina/trunk/core/src/main/java/org/apache/mina/common/IoUtil.java
- copied, changed from r589472, mina/trunk/core/src/main/java/org/apache/mina/common/MessageBroadcaster.java
Removed:
mina/trunk/core/src/main/java/org/apache/mina/common/MessageBroadcaster.java
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoService.java
mina/trunk/core/src/main/java/org/apache/mina/common/CompositeIoFuture.java
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoService.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoService.java?rev=589474&r1=589473&r2=589474&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoService.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoService.java Sun Oct 28 20:03:14 2007
@@ -199,7 +199,7 @@
// Convert to Set. We do not return a List here because only the
// direct caller of MessageBroadcaster knows the order of write
// operations.
- final List<WriteFuture> futures = MessageBroadcaster.broadcast(
+ final List<WriteFuture> futures = IoUtil.broadcast(
message, getManagedSessions());
return new AbstractSet<WriteFuture>() {
@Override
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/CompositeIoFuture.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/CompositeIoFuture.java?rev=589474&r1=589473&r2=589474&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/CompositeIoFuture.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/CompositeIoFuture.java Sun Oct 28 20:03:14 2007
@@ -6,7 +6,7 @@
* An {@link IoFuture} of {@link IoFuture}s. It is useful when you want to
* get notified when all {@link IoFuture}s are complete. It is not recommended
* to use {@link CompositeIoFuture} if you just want to wait for all futures.
- * In that case, please use {@link MessageBroadcaster#await(Iterable)} instead
+ * In that case, please use {@link IoUtil#await(Iterable)} instead
* for better performance.
*
* @author The Apache MINA Project (dev@mina.apache.org)
Copied: mina/trunk/core/src/main/java/org/apache/mina/common/IoUtil.java (from r589472, mina/trunk/core/src/main/java/org/apache/mina/common/MessageBroadcaster.java)
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/IoUtil.java?p2=mina/trunk/core/src/main/java/org/apache/mina/common/IoUtil.java&p1=mina/trunk/core/src/main/java/org/apache/mina/common/MessageBroadcaster.java&r1=589472&r2=589474&rev=589474&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/MessageBroadcaster.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/IoUtil.java Sun Oct 28 20:03:14 2007
@@ -32,7 +32,7 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-public class MessageBroadcaster {
+public class IoUtil {
private static final IoSession[] EMPTY_SESSIONS = new IoSession[0];
@@ -106,31 +106,31 @@
}
}
- public static void await(Iterable<WriteFuture> futures) throws InterruptedException {
- for (WriteFuture f: futures) {
+ public static void await(Iterable<? extends IoFuture> futures) throws InterruptedException {
+ for (IoFuture f: futures) {
f.await();
}
}
- public static void awaitUninterruptably(Iterable<WriteFuture> futures) {
- for (WriteFuture f: futures) {
+ public static void awaitUninterruptably(Iterable<? extends IoFuture> futures) {
+ for (IoFuture f: futures) {
f.awaitUninterruptibly();
}
}
- public static boolean await(Iterable<WriteFuture> futures, long timeout, TimeUnit unit) throws InterruptedException {
+ public static boolean await(Iterable<? extends IoFuture> futures, long timeout, TimeUnit unit) throws InterruptedException {
return await(futures, unit.toMillis(timeout));
}
- public static boolean await(Iterable<WriteFuture> futures, long timeoutMillis) throws InterruptedException {
+ public static boolean await(Iterable<? extends IoFuture> futures, long timeoutMillis) throws InterruptedException {
return await0(futures, timeoutMillis, true);
}
- public static boolean awaitUninterruptibly(Iterable<WriteFuture> futures, long timeout, TimeUnit unit) {
+ public static boolean awaitUninterruptibly(Iterable<? extends IoFuture> futures, long timeout, TimeUnit unit) {
return awaitUninterruptibly(futures, unit.toMillis(timeout));
}
- public static boolean awaitUninterruptibly(Iterable<WriteFuture> futures, long timeoutMillis) {
+ public static boolean awaitUninterruptibly(Iterable<? extends IoFuture> futures, long timeoutMillis) {
try {
return await0(futures, timeoutMillis, false);
} catch (InterruptedException e) {
@@ -138,14 +138,14 @@
}
}
- private static boolean await0(Iterable<WriteFuture> futures, long timeoutMillis, boolean interruptable) throws InterruptedException {
+ private static boolean await0(Iterable<? extends IoFuture> futures, long timeoutMillis, boolean interruptable) throws InterruptedException {
long startTime = timeoutMillis <= 0 ? 0 : System.currentTimeMillis();
long waitTime = timeoutMillis;
boolean lastComplete = true;
- Iterator<WriteFuture> i = futures.iterator();
+ Iterator<? extends IoFuture> i = futures.iterator();
while (i.hasNext()) {
- WriteFuture f = i.next();
+ IoFuture f = i.next();
do {
if (interruptable) {
lastComplete = f.await(waitTime);
@@ -168,6 +168,6 @@
return lastComplete && !i.hasNext();
}
- private MessageBroadcaster() {
+ private IoUtil() {
}
}