# ignite-nio - Removing message clone
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e66c060e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e66c060e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e66c060e Branch: refs/heads/sprint-1 Commit: e66c060ed6bcb4fe8a45790ecfb1476f1bc3b7b5 Parents: 947723c Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Fri Feb 13 20:17:06 2015 -0800 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Fri Feb 13 20:17:06 2015 -0800 ---------------------------------------------------------------------- .../org/apache/ignite/internal/util/ipc/IpcToNioAdapter.java | 4 ++-- .../ignite/internal/util/nio/GridShmemCommunicationClient.java | 4 ++-- .../ignite/internal/util/nio/GridTcpCommunicationClient.java | 5 ++++- 3 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e66c060e/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcToNioAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcToNioAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcToNioAdapter.java index 4f17a20..d1ae451 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcToNioAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcToNioAdapter.java @@ -152,7 +152,7 @@ public class IpcToNioAdapter<T> { assert writeBuf.hasArray(); try { -// MessageAdapter.WRITER.set(formatter.writer()); + MessageWriteState.create(formatter); int cnt = U.writeMessageFully(msg, endp.outputStream(), writeBuf); @@ -162,7 +162,7 @@ public class IpcToNioAdapter<T> { return new GridNioFinishedFuture<Object>(e); } finally { -// MessageAdapter.WRITER.remove(); + MessageWriteState.clear(); } return new GridNioFinishedFuture<>((Object)null); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e66c060e/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java index d81ba8e..e5ab12a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java @@ -116,7 +116,7 @@ public class GridShmemCommunicationClient extends GridAbstractCommunicationClien assert writeBuf.hasArray(); try { -// MessageAdapter.WRITER.set(formatter.writer()); + MessageWriteState.create(formatter); int cnt = U.writeMessageFully(msg, shmem.outputStream(), writeBuf); @@ -126,7 +126,7 @@ public class GridShmemCommunicationClient extends GridAbstractCommunicationClien throw new IgniteCheckedException("Failed to send message to remote node: " + shmem, e); } finally { -// MessageAdapter.WRITER.remove(); + MessageWriteState.clear(); } markUsed(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e66c060e/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridTcpCommunicationClient.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridTcpCommunicationClient.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridTcpCommunicationClient.java index e3e93bc..4dc326d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridTcpCommunicationClient.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridTcpCommunicationClient.java @@ -197,7 +197,7 @@ public class GridTcpCommunicationClient extends GridAbstractCommunicationClient assert writeBuf.hasArray(); try { -// msg.setWriter(formatter.writer()); + MessageWriteState.create(formatter); int cnt = U.writeMessageFully(msg, out, writeBuf); @@ -206,6 +206,9 @@ public class GridTcpCommunicationClient extends GridAbstractCommunicationClient catch (IOException e) { throw new IgniteCheckedException("Failed to send message to remote node: " + sock.getRemoteSocketAddress(), e); } + finally { + MessageWriteState.clear(); + } markUsed();
