ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [42/50] [abbrv] incubator-ignite git commit: # ignite-42
Date Thu, 22 Jan 2015 15:03:13 GMT
# ignite-42


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dde7f7a7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dde7f7a7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dde7f7a7

Branch: refs/heads/ignite-36
Commit: dde7f7a779bbe31470cf0f2d45ca912ea2935dc9
Parents: 3988390
Author: sboikov <sboikov@gridgain.com>
Authored: Thu Jan 22 12:54:33 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Thu Jan 22 12:54:33 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/transactions/IgniteTxLocalAdapter.java     | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dde7f7a7/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTxLocalAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTxLocalAdapter.java
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTxLocalAdapter.java
index a063535..ac7018f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTxLocalAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTxLocalAdapter.java
@@ -1958,15 +1958,14 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K,
V>
 
                             V old = null;
 
-                            boolean readThrough =
-                                cacheCtx.loadPreviousValue() && !F.isEmptyOrNulls(filter)
&& !F.isAlwaysTrue(filter);
+                            boolean readThrough = !F.isEmptyOrNulls(filter) && !F.isAlwaysTrue(filter);
 
                             if (optimistic()) {
                                 try {
                                     // Should read through if filter is specified.
                                     old = entry.innerGet(this,
                                         /*swap*/false,
-                                        /*read-through*/readThrough,
+                                        /*read-through*/cacheCtx.loadPreviousValue(),
                                         /*fail-fast*/false,
                                         /*unmarshal*/retval,
                                         /*metrics*/retval,


Mime
View raw message