Repository: ignite Updated Branches: refs/heads/ignite-2004 35abc3342 -> e90f50ce4
Merge branch 'master' into ignite-2004 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e90f50ce Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e90f50ce Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e90f50ce Branch: refs/heads/ignite-2004 Commit: e90f50ce4361c10a9fd4c59157fd550b5c3c2ab6 Parents: 35abc33 Author: nikolay_tikhonov <[email protected]> Authored: Tue Apr 12 13:37:34 2016 +0300 Committer: nikolay_tikhonov <[email protected]> Committed: Tue Apr 12 13:37:34 2016 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/processors/cache/GridCacheMapEntry.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e90f50ce/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java index 94cbb30..955fc74 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java @@ -1874,7 +1874,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme @Nullable final UUID subjId, final String taskName, @Nullable final CacheObject prevVal, - @Nullable final Long updateCntr + @Nullable final Long updateCntr, @Nullable GridDhtAtomicUpdateFuture fut ) throws IgniteCheckedException, GridCacheEntryRemovedException, GridClosureException { assert cctx.atomic();
