Ignite-67 GridMemcachedMessage 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/4b2c5664 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4b2c5664 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4b2c5664 Branch: refs/heads/ignite-67 Commit: 4b2c5664dba57460e54f6311a2d4906161938257 Parents: ebcf9c0 Author: avinogradov <avinogra...@gridgain.com> Authored: Wed Jan 28 16:37:17 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Wed Jan 28 16:37:17 2015 +0300 ---------------------------------------------------------------------- .../processors/rest/protocols/tcp/TcpRestParserSelfTest.java | 6 +++--- .../ignite/client/router/impl/GridTcpRouterNioParser.java | 4 ++-- .../processors/rest/protocols/tcp/GridMemcachedMessage.java | 4 ++-- .../processors/rest/protocols/tcp/GridTcpRestParser.java | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4b2c5664/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/TcpRestParserSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/TcpRestParserSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/TcpRestParserSelfTest.java index e5923c5..27c4a6f 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/TcpRestParserSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/TcpRestParserSelfTest.java @@ -120,7 +120,7 @@ public class TcpRestParserSelfTest extends GridCommonAbstractTest { @Nullable @Override public Object call() throws Exception { ByteBuffer fake = ByteBuffer.allocate(21); - fake.put(GRIDGAIN_REQ_FLAG); + fake.put(IGNITE_REQ_FLAG); fake.put(U.intToBytes(-5)); fake.put(U.longToBytes(0)); fake.put(U.longToBytes(0)); @@ -368,7 +368,7 @@ public class TcpRestParserSelfTest extends GridCommonAbstractTest { ByteBuffer slice = res.slice(); - slice.put(GRIDGAIN_REQ_FLAG); + slice.put(IGNITE_REQ_FLAG); slice.putInt(res.remaining() - 5); slice.putLong(msg.requestId()); slice.put(U.uuidToBytes(msg.clientId())); @@ -386,7 +386,7 @@ public class TcpRestParserSelfTest extends GridCommonAbstractTest { ByteBuffer res = ByteBuffer.allocate(6); res.put(new byte[] { - GRIDGAIN_HANDSHAKE_FLAG, 5, 0, 0, 0, 0 + IGNITE_HANDSHAKE_FLAG, 5, 0, 0, 0, 0 }); res.flip(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4b2c5664/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridTcpRouterNioParser.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridTcpRouterNioParser.java b/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridTcpRouterNioParser.java index 3debc9c..231b0f5 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridTcpRouterNioParser.java +++ b/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridTcpRouterNioParser.java @@ -59,7 +59,7 @@ class GridTcpRouterNioParser extends GridTcpRestParser { ByteBuffer res = ByteBuffer.allocate(resp.body().length + 45); - res.put(GRIDGAIN_REQ_FLAG); + res.put(IGNITE_REQ_FLAG); res.putInt(resp.body().length + 40); res.putLong(resp.requestId()); res.put(U.uuidToBytes(resp.clientId())); @@ -79,7 +79,7 @@ class GridTcpRouterNioParser extends GridTcpRestParser { ByteBuffer slice = res.slice(); - slice.put(GRIDGAIN_REQ_FLAG); + slice.put(IGNITE_REQ_FLAG); slice.putInt(res.remaining() - 5); slice.putLong(clientMsg.requestId()); slice.put(U.uuidToBytes(clientMsg.clientId())); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4b2c5664/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridMemcachedMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridMemcachedMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridMemcachedMessage.java index 3587f3a..707383f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridMemcachedMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridMemcachedMessage.java @@ -46,10 +46,10 @@ public class GridMemcachedMessage implements GridClientMessage { public static final byte MEMCACHE_RES_FLAG = (byte)0x81; /** Custom client request flag. */ - public static final byte GRIDGAIN_REQ_FLAG = (byte)0x90; + public static final byte IGNITE_REQ_FLAG = (byte)0x90; /** Client handshake flag. */ - public static final byte GRIDGAIN_HANDSHAKE_FLAG = (byte)0x91; + public static final byte IGNITE_HANDSHAKE_FLAG = (byte)0x91; /** Success status. */ public static final int SUCCESS = 0x0000; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4b2c5664/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 7e8722b..1d6f4ce 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 @@ -65,7 +65,7 @@ public class GridTcpRestParser implements GridNioParser { break; - case GRIDGAIN_REQ_FLAG: + case IGNITE_REQ_FLAG: // Skip header. buf.get(); @@ -73,7 +73,7 @@ public class GridTcpRestParser implements GridNioParser { break; - case GRIDGAIN_HANDSHAKE_FLAG: + case IGNITE_HANDSHAKE_FLAG: // Skip header. buf.get(); @@ -134,7 +134,7 @@ public class GridTcpRestParser implements GridNioParser { ByteBuffer slice = res.slice(); - slice.put(GRIDGAIN_REQ_FLAG); + slice.put(IGNITE_REQ_FLAG); slice.putInt(res.remaining() - 5); slice.putLong(msg.requestId()); slice.put(U.uuidToBytes(msg.clientId()));
