Return-Path: 
 <commits-return-82280-apmail-ignite-commits-archive=ignite.apache.org@ignite.apache.org>
X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org
Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 98F0318E61
	for <apmail-ignite-commits-archive@minotaur.apache.org>;
 Mon, 23 Nov 2015 06:39:20 +0000 (UTC)
Received: (qmail 28829 invoked by uid 500); 23 Nov 2015 06:39:20 -0000
Delivered-To: apmail-ignite-commits-archive@ignite.apache.org
Received: (qmail 28647 invoked by uid 500); 23 Nov 2015 06:39:20 -0000
Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@ignite.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@ignite.apache.org>
List-Post: <mailto:commits@ignite.apache.org>
List-Id: <commits.ignite.apache.org>
Reply-To: dev@ignite.apache.org
Delivered-To: mailing list commits@ignite.apache.org
Received: (qmail 26654 invoked by uid 99); 23 Nov 2015 06:39:17 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Nov 2015 06:39:17 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 2C060E048E; Mon, 23 Nov 2015 06:39:17 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: agoncharuk@apache.org
To: commits@ignite.apache.org
Date: Mon, 23 Nov 2015 06:40:01 -0000
Message-Id: <7788ffc1076e461fab1bde6efe4c5532@git.apache.org>
In-Reply-To: <4b6b8216c4284acaad5fbf50ccd20410@git.apache.org>
References: <4b6b8216c4284acaad5fbf50ccd20410@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [46/51] [abbrv] ignite git commit: Fixed NPE in GridNioServer

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-1.5-tx-futs-opts
Commit: 5d224f192cee59b9f7dee2a0741c5b334657b845
Parents: 457ca6f
Author: Valentin Kulichenko <valentin.kulichenko@gmail.com>
Authored: Sat Nov 21 13:14:52 2015 -0800
Committer: Valentin Kulichenko <valentin.kulichenko@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();
                     }