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/09/14 15:13:28 UTC
mina git commit: Fixed a NPE (DIRMINA-1043)
Repository: mina
Updated Branches:
refs/heads/2.0 9ed90e0d3 -> 787363ba2
Fixed a NPE (DIRMINA-1043)
Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/787363ba
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/787363ba
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/787363ba
Branch: refs/heads/2.0
Commit: 787363ba220def8fb8487e859d0d0113b0641dac
Parents: 9ed90e0
Author: Emmanuel L�charny <el...@apache.org>
Authored: Wed Sep 14 17:11:53 2016 +0200
Committer: Emmanuel L�charny <el...@apache.org>
Committed: Wed Sep 14 17:11:53 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/mina/core/session/AbstractIoSession.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina/blob/787363ba/mina-core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java b/mina-core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java
index 63d975d..179f790 100644
--- a/mina-core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java
+++ b/mina-core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java
@@ -366,7 +366,13 @@ public abstract class AbstractIoSession implements IoSession {
if (writeRequestQueue != null) {
while (!writeRequestQueue.isEmpty(this)) {
WriteRequest writeRequest = writeRequestQueue.poll(this);
- writeRequest.getFuture().setWritten();
+ WriteFuture writeFuture = writeRequest.getFuture();
+
+ // The WriteRequest may not always have a future : The CLOSE_REQUEST
+ // and MESSAGE_SENT_REQUEST don't.
+ if (writeFuture != null) {
+ writeFuture.setWritten();
+ }
}
}
}