Merge branch 'master' into ignite-2934
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b8fec8df Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b8fec8df Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b8fec8df Branch: refs/heads/ignite-2934 Commit: b8fec8dfee706e3411f991b4ada3bb7ced7b510f Parents: b6a0078 244441a Author: vozerov-gridgain <[email protected]> Authored: Fri Apr 1 14:23:56 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Fri Apr 1 14:23:56 2016 +0300 ---------------------------------------------------------------------- .../cache/CacheEvictableEntryImpl.java | 2 +- .../processors/cache/GridCacheAdapter.java | 158 +++++-------------- .../processors/cache/GridCacheContext.java | 18 +-- .../processors/cache/GridCacheMapEntry.java | 4 +- .../processors/cache/GridCacheUtils.java | 10 ++ .../GridDistributedTxRemoteAdapter.java | 3 +- .../dht/atomic/GridDhtAtomicCache.java | 89 ++++++----- .../distributed/near/GridNearAtomicCache.java | 15 +- .../distributed/near/GridNearCacheAdapter.java | 30 +--- .../local/atomic/GridLocalAtomicCache.java | 60 +++---- .../cache/transactions/IgniteInternalTx.java | 4 +- .../cache/transactions/IgniteTxAdapter.java | 3 +- .../transactions/IgniteTxLocalAdapter.java | 62 +++----- .../cache/transactions/IgniteTxLocalEx.java | 8 +- 14 files changed, 183 insertions(+), 283 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b8fec8df/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b8fec8df/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ----------------------------------------------------------------------
