ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vkuliche...@apache.org
Subject ignite git commit: Communication fixes
Date Sat, 16 Jan 2016 05:38:28 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5.4-c e03823953 -> 5936109cd


Communication fixes


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5936109c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5936109c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5936109c

Branch: refs/heads/ignite-1.5.4-c
Commit: 5936109cd07c714d97b8be6c5bff3efbf97518d0
Parents: e038239
Author: Valentin Kulichenko <valentin.kulichenko@gmail.com>
Authored: Fri Jan 15 21:38:21 2016 -0800
Committer: Valentin Kulichenko <valentin.kulichenko@gmail.com>
Committed: Fri Jan 15 21:38:21 2016 -0800

----------------------------------------------------------------------
 .../org/apache/ignite/internal/util/IgniteUtils.java    |  3 ++-
 .../apache/ignite/internal/util/nio/GridNioServer.java  | 12 ++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/5936109c/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 58f0828..5784a4d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -9273,7 +9273,8 @@ public abstract class IgniteUtils {
         assert buf != null;
         assert buf.hasArray();
 
-        writer.setCurrentWriteClass(msg.getClass());
+        if (writer != null)
+            writer.setCurrentWriteClass(msg.getClass());
 
         boolean finished = false;
         int cnt = 0;

http://git-wip-us.apache.org/repos/asf/ignite/blob/5936109c/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 496c1e3..ce82323 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
@@ -1001,7 +1001,8 @@ public class GridNioServer<T> {
 
                         assert msg != null;
 
-                        writer.setCurrentWriteClass(msg.getClass());
+                        if (writer != null)
+                            writer.setCurrentWriteClass(msg.getClass());
 
                         finished = msg.writeTo(buf, writer);
 
@@ -1025,7 +1026,8 @@ public class GridNioServer<T> {
 
                         assert msg != null;
 
-                        writer.setCurrentWriteClass(msg.getClass());
+                        if (writer != null)
+                            writer.setCurrentWriteClass(msg.getClass());
 
                         finished = msg.writeTo(buf, writer);
 
@@ -1171,7 +1173,8 @@ public class GridNioServer<T> {
 
                 assert msg != null;
 
-                writer.setCurrentWriteClass(msg.getClass());
+                if (writer != null)
+                    writer.setCurrentWriteClass(msg.getClass());
 
                 finished = msg.writeTo(buf, writer);
 
@@ -1197,7 +1200,8 @@ public class GridNioServer<T> {
 
                 assert msg != null;
 
-                writer.setCurrentWriteClass(msg.getClass());
+                if (writer != null)
+                    writer.setCurrentWriteClass(msg.getClass());
 
                 finished = msg.writeTo(buf, writer);
 


Mime
View raw message