ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: ignite-1516-1
Date Mon, 21 Sep 2015 12:18:42 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-1516-1 eb8d17056 -> 1ded94360


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/1ded9436
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1ded9436
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1ded9436

Branch: refs/heads/ignite-1516-1
Commit: 1ded9436060affe0d5e530e844933faf0177af6d
Parents: eb8d170
Author: sboikov <sboikov@gridgain.com>
Authored: Mon Sep 21 15:18:32 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon Sep 21 15:18:32 2015 +0300

----------------------------------------------------------------------
 .../processors/query/h2/opt/GridH2AbstractKeyValueRow.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/1ded9436/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 bee5a69..4f515ac 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
@@ -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(peekValue(VAL_COL))) == null &&
(v = getOffheapValue(VAL_COL)) == null) {
+                            if ((v = WeakValue.unwrap(syncValue(0))) == null && (v
= getOffheapValue(VAL_COL)) == null) {
                                 Value upd = desc.wrap(valObj, desc.valueType());
 
                                 v = updateWeakValue(upd);


Mime
View raw message