Repository: mina Updated Branches: refs/heads/2.0 f029e2326 -> 0a30a079f
Fixed a NPE (DIRMINA-982) Project: http://git-wip-us.apache.org/repos/asf/mina/repo Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/3b793f34 Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/3b793f34 Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/3b793f34 Branch: refs/heads/2.0 Commit: 3b793f343263a6750fd034b725db83e89bc345c3 Parents: f029e23 Author: Emmanuel Lécharny <[email protected]> Authored: Tue Sep 2 08:16:44 2014 +0200 Committer: Emmanuel Lécharny <[email protected]> Committed: Tue Sep 2 08:16:44 2014 +0200 ---------------------------------------------------------------------- .../java/org/apache/mina/core/write/DefaultWriteRequest.java | 4 ++++ .../java/org/apache/mina/filter/codec/ProtocolCodecFilter.java | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina/blob/3b793f34/mina-core/src/main/java/org/apache/mina/core/write/DefaultWriteRequest.java ---------------------------------------------------------------------- diff --git a/mina-core/src/main/java/org/apache/mina/core/write/DefaultWriteRequest.java b/mina-core/src/main/java/org/apache/mina/core/write/DefaultWriteRequest.java index 3a9aac6..d3a9e74 100644 --- a/mina-core/src/main/java/org/apache/mina/core/write/DefaultWriteRequest.java +++ b/mina-core/src/main/java/org/apache/mina/core/write/DefaultWriteRequest.java @@ -32,6 +32,10 @@ import org.apache.mina.core.session.IoSession; * @author <a href="http://mina.apache.org";>Apache MINA Project</a> */ public class DefaultWriteRequest implements WriteRequest { + /** An empty message */ + public static final byte[] EMPTY_MESSAGE = new byte[] {}; + + /** An empty FUTURE */ private static final WriteFuture UNUSED_FUTURE = new WriteFuture() { public boolean isWritten() { return false; http://git-wip-us.apache.org/repos/asf/mina/blob/3b793f34/mina-core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java ---------------------------------------------------------------------- diff --git a/mina-core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java b/mina-core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java index f413491..99270e5 100644 --- a/mina-core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java +++ b/mina-core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java @@ -445,7 +445,8 @@ public class ProtocolCodecFilter extends IoFilterAdapter { if (future == null) { // Creates an empty writeRequest containing the destination - WriteRequest writeRequest = new DefaultWriteRequest(null, null, destination); + WriteRequest writeRequest = new DefaultWriteRequest( + DefaultWriteRequest.EMPTY_MESSAGE, null, destination); future = DefaultWriteFuture.newNotWrittenFuture(session, new NothingWrittenException(writeRequest)); }
