Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-single-op-get
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a68645a6 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a68645a6 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a68645a6 Branch: refs/heads/ignite-single-op-get Commit: a68645a610d81443e89e9e290c91be955dbdb8ec Parents: 6c685b8 Author: sboikov <sboi...@gridgain.com> Authored: Wed Nov 18 23:21:10 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Wed Nov 18 23:21:10 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheIoManager.java | 4 ++-- .../cache/distributed/near/GridNearSingleGetRequest.java | 2 +- .../cache/distributed/near/GridNearSingleGetResponse.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a68645a6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java index 5c3eb3c..9afbca8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java @@ -520,7 +520,7 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter { break; - case 115: { + case 116: { GridNearSingleGetRequest req = (GridNearSingleGetRequest)msg; GridNearSingleGetResponse res = new GridNearSingleGetResponse( @@ -538,7 +538,7 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter { break; - case 116: { + case 117: { GridNearSingleGetResponse res = (GridNearSingleGetResponse)msg; GridPartitionedSingleGetFuture fut = (GridPartitionedSingleGetFuture)ctx.mvcc().future(res.futureId()); http://git-wip-us.apache.org/repos/asf/ignite/blob/a68645a6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java index 073df94..a506007 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java @@ -381,7 +381,7 @@ public class GridNearSingleGetRequest extends GridCacheMessage implements GridCa /** {@inheritDoc} */ @Override public byte directType() { - return 115; + return 116; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a68645a6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java index 66b4d9b..ba0081c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java @@ -306,7 +306,7 @@ public class GridNearSingleGetResponse extends GridCacheMessage implements GridC /** {@inheritDoc} */ @Override public byte directType() { - return 116; + return 117; } /** {@inheritDoc} */
