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/03 10:43:46 UTC
svn commit: r591568 - in
/mina/trunk/core/src/main/java/org/apache/mina/filter/traffic:
WriteThrottleFilter.java WriteThrottlePolicy.java
Author: trustin
Date: Sat Nov 3 02:43:46 2007
New Revision: 591568
URL: http://svn.apache.org/viewvc?rev=591568&view=rev
Log:
* Renamed WriteThrottlePolicy.EXCEPTION to FAIL
* Added WriteThrottlePolicy.LOG_AND_FAIL
Modified:
mina/trunk/core/src/main/java/org/apache/mina/filter/traffic/WriteThrottleFilter.java
mina/trunk/core/src/main/java/org/apache/mina/filter/traffic/WriteThrottlePolicy.java
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/traffic/WriteThrottleFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/traffic/WriteThrottleFilter.java?rev=591568&r1=591567&r2=591568&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/traffic/WriteThrottleFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/traffic/WriteThrottleFilter.java Sat Nov 3 02:43:46 2007
@@ -270,8 +270,13 @@
log(session);
block(session);
break;
- case EXCEPTION:
- raiseException(session, writeRequest);
+ case FAIL:
+ fail(session, writeRequest);
+ break;
+ case LOG_AND_FAIL:
+ log(session);
+ fail(session, writeRequest);
+ break;
default:
throw new InternalError();
}
@@ -366,7 +371,7 @@
}
}
- private void raiseException(IoSession session, WriteRequest writeRequest) throws WriteException {
+ private void fail(IoSession session, WriteRequest writeRequest) throws WriteException {
throw new TooManyScheduledWritesException(writeRequest, getMessage(session));
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/traffic/WriteThrottlePolicy.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/traffic/WriteThrottlePolicy.java?rev=591568&r1=591567&r2=591568&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/traffic/WriteThrottlePolicy.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/traffic/WriteThrottlePolicy.java Sat Nov 3 02:43:46 2007
@@ -47,16 +47,19 @@
*/
BLOCK,
/**
- * Combination of {@link #WARN} and {@link #BLOCK}.
+ * Combination of {@link #LOG} and {@link #BLOCK}.
*/
LOG_AND_BLOCK,
/**
- * Raise a {@link TooManyScheduledWritesException}. Please note that
- * the exception is <strong>not</strong> thrown back directly to the
- * caller. Instead, the {@link WriteFuture#getException() exception}
- * property of the returned {@link WriteFuture} will return the exception.
+ * Make the write operation fail immediately.
+ * The '{@link WriteFuture#getException() exception}' property of
+ * the returned {@link WriteFuture} will be {@link TooManyScheduledWritesException}.
* The exception will also be notified as an <tt>exceptionCaught</tt>
* event.
*/
- EXCEPTION,
+ FAIL,
+ /**
+ * Combination of {@link #LOG} and {@link #FAIL}.
+ */
+ LOG_AND_FAIL,
}