Fixed NPE in GridNioServer
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5d224f19 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5d224f19 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5d224f19 Branch: refs/heads/ignite-sql-opt Commit: 5d224f192cee59b9f7dee2a0741c5b334657b845 Parents: 457ca6f Author: Valentin Kulichenko <valentin.kuliche...@gmail.com> Authored: Sat Nov 21 13:14:52 2015 -0800 Committer: Valentin Kulichenko <valentin.kuliche...@gmail.com> Committed: Sat Nov 21 13:14:52 2015 -0800 ---------------------------------------------------------------------- .../java/org/apache/ignite/internal/util/nio/GridNioServer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/5d224f19/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java index 384ee1a..c0f5cfc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java @@ -997,7 +997,7 @@ public class GridNioServer<T> { finished = msg.writeTo(buf, writer); - if (finished) + if (finished && writer != null) writer.reset(); } @@ -1019,7 +1019,7 @@ public class GridNioServer<T> { finished = msg.writeTo(buf, writer); - if (finished) + if (finished && writer != null) writer.reset(); }