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 2016/02/16 15:39:42 UTC
[1/3] mina git commit: Don't try to reset a message when it's not a
IoBuffer
Repository: mina
Updated Branches:
refs/heads/2.0 a42871a77 -> 35c0aac3d
Don't try to reset a message when it's not a IoBuffer
Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/44b58469
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/44b58469
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/44b58469
Branch: refs/heads/2.0
Commit: 44b58469f84ce991074cdc187b1c1f23b94cf445
Parents: a42871a
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Tue Feb 16 15:38:14 2016 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Tue Feb 16 15:38:14 2016 +0100
----------------------------------------------------------------------
.../core/polling/AbstractPollingIoProcessor.java | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina/blob/44b58469/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java b/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java
index 09182d5..310a7ae 100644
--- a/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java
+++ b/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java
@@ -920,16 +920,23 @@ public abstract class AbstractPollingIoProcessor<S extends AbstractIoSession> im
}
session.increaseWrittenBytes(localWrittenBytes, currentTime);
-
+
+ // Now, forward the original message
if (!buf.hasRemaining() || (!hasFragmentation && (localWrittenBytes != 0))) {
// Buffer has been sent, clear the current request.
- int pos = buf.position();
- buf.reset();
+ Object originalMessage = req.getOriginalRequest().getMessage();
- fireMessageSent(session, req);
+ if (originalMessage instanceof IoBuffer) {
+ buf = ((IoBuffer)req.getOriginalRequest().getMessage());
- // And set it back to its position
- buf.position(pos);
+ int pos = buf.position();
+ buf.reset();
+ fireMessageSent(session, req);
+ // And set it back to its position
+ buf.position(pos);
+ } else {
+ fireMessageSent(session, req);
+ }
}
return localWrittenBytes;
[2/3] mina git commit: Mark the buffer to be able to reset it
Posted by el...@apache.org.
Mark the buffer to be able to reset it
Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/c69999b9
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/c69999b9
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/c69999b9
Branch: refs/heads/2.0
Commit: c69999b916446d632c6d0167eb3ee6017e7296e3
Parents: 44b5846
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Tue Feb 16 15:38:40 2016 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Tue Feb 16 15:38:40 2016 +0100
----------------------------------------------------------------------
mina-core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina/blob/c69999b9/mina-core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java b/mina-core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java
index 59e67ed..e91ab6b 100644
--- a/mina-core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java
+++ b/mina-core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java
@@ -630,6 +630,7 @@ public class SslFilter extends IoFilterAdapter {
sslHandler.scheduleFilterWrite(nextFilter, writeRequest);
} else if (sslHandler.isHandshakeComplete()) {
// SSL encrypt
+ buf.mark();
sslHandler.encrypt(buf.buf());
IoBuffer encryptedBuffer = sslHandler.fetchOutNetBuffer();
sslHandler.scheduleFilterWrite(nextFilter, new EncryptedWriteRequest(writeRequest,
[3/3] mina git commit: Added some traces
Posted by el...@apache.org.
Added some traces
Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/35c0aac3
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/35c0aac3
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/35c0aac3
Branch: refs/heads/2.0
Commit: 35c0aac3dce0ff709687a584c85e2ba9254d1967
Parents: c69999b
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Tue Feb 16 15:39:09 2016 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Tue Feb 16 15:39:09 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/mina/example/tcp/perf/TcpSslClient.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina/blob/35c0aac3/mina-example/src/main/java/org/apache/mina/example/tcp/perf/TcpSslClient.java
----------------------------------------------------------------------
diff --git a/mina-example/src/main/java/org/apache/mina/example/tcp/perf/TcpSslClient.java b/mina-example/src/main/java/org/apache/mina/example/tcp/perf/TcpSslClient.java
index d9132cf..15337d8 100644
--- a/mina-example/src/main/java/org/apache/mina/example/tcp/perf/TcpSslClient.java
+++ b/mina-example/src/main/java/org/apache/mina/example/tcp/perf/TcpSslClient.java
@@ -122,6 +122,9 @@ public class TcpSslClient extends IoHandlerAdapter {
*/
@Override
public void messageSent(IoSession session, Object message) throws Exception {
+ if (counter.getCount() % 10000 == 0) {
+ System.out.println("Sent " + counter + " messages");
+ }
}
/**