You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/09/21 12:32:49 UTC
ignite git commit: ignite-1516-1
Repository: ignite
Updated Branches:
refs/heads/ignite-1516-1 [created] eb8d17056
ignite-1516-1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/eb8d1705
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/eb8d1705
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/eb8d1705
Branch: refs/heads/ignite-1516-1
Commit: eb8d17056c3d62b6ed73aedc20b0a13317e6ed4b
Parents: 8c27ad9
Author: sboikov <sb...@gridgain.com>
Authored: Mon Sep 21 13:32:38 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Sep 21 13:32:38 2015 +0300
----------------------------------------------------------------------
.../processors/query/h2/opt/GridH2AbstractKeyValueRow.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8d1705/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java
index c2cd23e..bee5a69 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java
@@ -185,7 +185,7 @@ public abstract class GridH2AbstractKeyValueRow extends GridH2Row {
Value v;
if (col == VAL_COL) {
- v = syncValue(0);
+ v = peekValue(VAL_COL);
long start = 0;
int attempt = 0;
@@ -212,7 +212,7 @@ public abstract class GridH2AbstractKeyValueRow extends GridH2Row {
if (valObj != null) {
// Even if we've found valObj in swap, it is may be some new value,
// while the needed value was already unswapped, so we have to recheck it.
- if ((v = WeakValue.unwrap(syncValue(0))) == null && (v = getOffheapValue(VAL_COL)) == null) {
+ if ((v = WeakValue.unwrap(peekValue(VAL_COL))) == null && (v = getOffheapValue(VAL_COL)) == null) {
Value upd = desc.wrap(valObj, desc.valueType());
v = updateWeakValue(upd);