ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [2/2] ignite git commit: Merge branch 'master' into ignite-2931
Date Fri, 01 Apr 2016 11:11:57 GMT
Merge branch 'master' into ignite-2931


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

Branch: refs/heads/ignite-2931
Commit: 71ab05df05e3d68fb4d49cb1f34bfbd7ac6ca518
Parents: 1e343f2 1aa2a2b
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Fri Apr 1 14:08:28 2016 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Fri Apr 1 14:08:28 2016 +0300

----------------------------------------------------------------------
 .../dht/atomic/GridDhtAtomicCache.java          | 28 +++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/71ab05df/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 3b7d0ff,1797acd..1b5b8ad
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@@ -1048,9 -1059,11 +1048,11 @@@ public class GridDhtAtomicCache<K, V> e
          @Nullable EntryProcessor proc,
          @Nullable Object[] invokeArgs,
          boolean retval,
 -        @Nullable final CacheEntryPredicate[] filter,
 +        @Nullable CacheEntryPredicate filter,
          boolean waitTopFut
      ) {
+         CacheOperationContext opCtx = ctx.operationContextPerCall();
+ 
          GridCacheOperation op;
          Collection vals;
  


Mime
View raw message