Ignite-67 GridClientPacketType properties fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bc3f2efc Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bc3f2efc Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bc3f2efc Branch: refs/heads/ignite-67 Commit: bc3f2efc2b5a2108cbf14b109042b25b8f33ef1c Parents: a8fb667 Author: avinogradov <avinogra...@gridgain.com> Authored: Wed Jan 28 16:41:09 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Wed Jan 28 16:41:09 2015 +0300 ---------------------------------------------------------------------- .../rest/protocols/tcp/GridClientPacketType.java | 4 ++-- .../rest/protocols/tcp/GridTcpRestParser.java | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bc3f2efc/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridClientPacketType.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridClientPacketType.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridClientPacketType.java index fef6fe3..61d67a4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridClientPacketType.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridClientPacketType.java @@ -25,8 +25,8 @@ public enum GridClientPacketType { MEMCACHE, /** GridGain handshake. */ - GRIDGAIN_HANDSHAKE, + IGNITE_HANDSHAKE, /** GridGain message. */ - GRIDGAIN + IGNITE } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bc3f2efc/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java index 1d6f4ce..98a7753 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java @@ -69,7 +69,7 @@ public class GridTcpRestParser implements GridNioParser { // Skip header. buf.get(); - state.packetType(GridClientPacketType.GRIDGAIN); + state.packetType(GridClientPacketType.IGNITE); break; @@ -77,7 +77,7 @@ public class GridTcpRestParser implements GridNioParser { // Skip header. buf.get(); - state.packetType(GridClientPacketType.GRIDGAIN_HANDSHAKE); + state.packetType(GridClientPacketType.IGNITE_HANDSHAKE); break; @@ -95,12 +95,12 @@ public class GridTcpRestParser implements GridNioParser { break; - case GRIDGAIN_HANDSHAKE: + case IGNITE_HANDSHAKE: res = parseHandshake(buf, state); break; - case GRIDGAIN: + case IGNITE: res = parseCustomPacket(ses, buf, state); break; @@ -251,7 +251,7 @@ public class GridTcpRestParser implements GridNioParser { * @return True if a hint was parsed, false if still need more bytes to parse. */ @Nullable private GridClientMessage parseHandshake(ByteBuffer buf, ParserState state) { - assert state.packetType() == GridClientPacketType.GRIDGAIN_HANDSHAKE; + assert state.packetType() == GridClientPacketType.IGNITE_HANDSHAKE; int idx = state.index(); @@ -306,7 +306,7 @@ public class GridTcpRestParser implements GridNioParser { */ @Nullable private GridClientMessage parseCustomPacket(GridNioSession ses, ByteBuffer buf, ParserState state) throws IOException, IgniteCheckedException { - assert state.packetType() == GridClientPacketType.GRIDGAIN; + assert state.packetType() == GridClientPacketType.IGNITE; assert state.packet() == null; ByteArrayOutputStream tmp = state.buffer();
