You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by jo...@apache.org on 2020/04/15 15:41:27 UTC
[mina] branch 2.1.X updated (26ecc05 -> 55f4b4d)
This is an automated email from the ASF dual-hosted git repository.
johnnyv pushed a change to branch 2.1.X
in repository https://gitbox.apache.org/repos/asf/mina.git.
from 26ecc05 adds NULL check to SslHandler line 537-545 for valid WriteRequestQueue
new 9643e5f adds misc code comment for clarity
new 55f4b4d Fix DIRMINA-996 adds "break" to prevent message sent loop
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java | 4 +++-
.../org/apache/mina/transport/socket/nio/NioDatagramAcceptor.java | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
[mina] 02/02: Fix DIRMINA-996 adds "break" to prevent message sent
loop
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
johnnyv pushed a commit to branch 2.1.X
in repository https://gitbox.apache.org/repos/asf/mina.git
commit 55f4b4d66bd05b4f26d61e1ad51f025e20452889
Author: johnnyv <jo...@apache.org>
AuthorDate: Wed Apr 15 11:41:23 2020 -0400
Fix DIRMINA-996 adds "break" to prevent message sent loop
---
.../org/apache/mina/transport/socket/nio/NioDatagramAcceptor.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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 a2f7420..42b74ce 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
@@ -896,8 +896,10 @@ public final class NioDatagramAcceptor extends AbstractIoAcceptor implements Dat
// Kernel buffer is full or wrote too much
setInterestedInWrite(session, true);
- session.getWriteRequestQueue().offer(session, writeRequest);
+ writeRequestQueue.offer(session, writeRequest);
scheduleFlush(session);
+
+ break;
} else {
setInterestedInWrite(session, false);
[mina] 01/02: adds misc code comment for clarity
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
johnnyv pushed a commit to branch 2.1.X
in repository https://gitbox.apache.org/repos/asf/mina.git
commit 9643e5f87829c8a80477ef49c1f4c27387ff8cba
Author: johnnyv <jo...@apache.org>
AuthorDate: Sat Nov 23 21:03:50 2019 -0500
adds misc code comment for clarity
---
.../java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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 8b13e99..105013e 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
@@ -910,7 +910,9 @@ public abstract class AbstractPollingIoProcessor<S extends AbstractIoSession> im
}
// Reset the Schedule for flush flag for this session,
- // as we are flushing it now
+ // as we are flushing it now. This allows another thread
+ // to enqueue data to be written without corrupting the
+ // selector interest state.
session.unscheduledForFlush();
SessionState state = getState(session);