Merge branch ignite-920 into ignite-sprint-5
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f9a4dd7f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f9a4dd7f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f9a4dd7f Branch: refs/heads/ignite-709_2 Commit: f9a4dd7f580abc3d66630531bb66c3bf4d75d1d8 Parents: 02d0acd Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Tue May 19 11:16:27 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Tue May 19 11:16:27 2015 -0700 ---------------------------------------------------------------------- .../internal/processors/cache/GridCacheIoManager.java | 1 + .../distributed/near/GridNearTxPrepareFutureAdapter.java | 9 +++++++-- .../processors/cache/IgniteCacheNearLockValueSelfTest.java | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f9a4dd7f/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 d5dd492..02f16c0 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 @@ -487,6 +487,7 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter { req.futureId(), req.miniId(), req.version(), + req.version(), null, null, null); res.error(req.classError()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f9a4dd7f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java index 60b918c..b7a2fee 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java @@ -214,10 +214,15 @@ public abstract class GridNearTxPrepareFutureAdapter extends GridCompoundIdentit } if (!m.empty()) { + GridCacheVersion writeVer = res.writeVersion(); + + if (writeVer == null) + writeVer = res.dhtVersion(); + // Register DHT version. - tx.addDhtVersion(m.node().id(), res.dhtVersion()); + tx.addDhtVersion(m.node().id(), res.dhtVersion(), writeVer); - m.dhtVersion(res.dhtVersion()); + m.dhtVersion(res.dhtVersion(), writeVer); if (m.near()) tx.readyNearLocks(m, res.pending(), res.committedVersions(), res.rolledbackVersions()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f9a4dd7f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java index fe60331..5cc9d04 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*;
