Author: elecharny
Date: Tue Nov 6 13:31:59 2012
New Revision: 1406129
URL: http://svn.apache.org/viewvc?rev=1406129&view=rev
Log:
Moved the incrementation fo the number of sent message close to where the
messageSent() event is generated
Modified:
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChain.java
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java
Modified:
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChain.java
URL:
http://svn.apache.org/viewvc/mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChain.java?rev=1406129&r1=1406128&r2=1406129&view=diff
==============================================================================
---
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChain.java
(original)
+++
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChain.java
Tue Nov 6 13:31:59 2012
@@ -583,11 +583,7 @@ public class DefaultIoFilterChain implem
buffer.mark();
int remaining = buffer.remaining();
- if (remaining == 0) {
- // Zero-sized buffer means the internal message
- // delimiter.
- s.increaseScheduledWriteMessages();
- } else {
+ if (remaining > 0) {
s.increaseScheduledWriteBytes(remaining);
}
} else {
Modified:
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java
URL:
http://svn.apache.org/viewvc/mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java?rev=1406129&r1=1406128&r2=1406129&view=diff
==============================================================================
---
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java
(original)
+++
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java
Tue Nov 6 13:31:59 2012
@@ -944,6 +944,8 @@ public abstract class AbstractPollingIoP
int pos = buf.position();
buf.reset();
+ session.increaseScheduledWriteMessages();
+
fireMessageSent(session, req);
// And set it back to its position
