Merge remote-tracking branch 'remotes/origin/ignite-630'
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ed5d3ed1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ed5d3ed1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ed5d3ed1 Branch: refs/heads/ignite-1121 Commit: ed5d3ed1c03f062d29cfc53a35b6b35436859f28 Parents: 06b2504 80cec1b Author: Anton Vinogradov <avinogra...@gridgain.com> Authored: Thu Jul 23 18:47:00 2015 +0300 Committer: Anton Vinogradov <avinogra...@gridgain.com> Committed: Thu Jul 23 18:47:00 2015 +0300 ---------------------------------------------------------------------- .../rest/protocols/tcp/MockNioSession.java | 15 - .../cache/CacheEvictableEntryImpl.java | 2 +- .../processors/cache/GridCacheAdapter.java | 13 +- .../processors/cache/GridCacheEntryEx.java | 32 +- .../cache/GridCacheEvictionManager.java | 12 +- .../processors/cache/GridCacheMapEntry.java | 208 +------------ .../processors/cache/GridCacheUtils.java | 18 +- .../extras/GridCacheAttributesEntryExtras.java | 37 +-- .../GridCacheAttributesMvccEntryExtras.java | 35 +-- ...dCacheAttributesMvccObsoleteEntryExtras.java | 35 +-- ...cheAttributesMvccObsoleteTtlEntryExtras.java | 35 +-- .../GridCacheAttributesMvccTtlEntryExtras.java | 35 +-- .../GridCacheAttributesObsoleteEntryExtras.java | 36 +-- ...idCacheAttributesObsoleteTtlEntryExtras.java | 36 +-- .../GridCacheAttributesTtlEntryExtras.java | 36 +-- .../cache/extras/GridCacheEntryExtras.java | 14 - .../extras/GridCacheEntryExtrasAdapter.java | 8 - .../cache/extras/GridCacheMvccEntryExtras.java | 8 - .../GridCacheMvccObsoleteEntryExtras.java | 8 - .../GridCacheMvccObsoleteTtlEntryExtras.java | 9 - .../extras/GridCacheMvccTtlEntryExtras.java | 8 - .../extras/GridCacheObsoleteEntryExtras.java | 8 - .../extras/GridCacheObsoleteTtlEntryExtras.java | 9 - .../cache/extras/GridCacheTtlEntryExtras.java | 8 - .../store/GridCacheStoreManagerAdapter.java | 2 +- .../cache/transactions/IgniteInternalTx.java | 16 +- .../cache/transactions/IgniteTxAdapter.java | 6 +- .../util/lang/GridMetadataAwareAdapter.java | 296 +++++++++---------- .../cache/eviction/GridCacheMockEntry.java | 12 +- .../nio/impl/GridNioFilterChainSelfTest.java | 15 - .../GridMetadataAwareAdapterLoadSelfTest.java | 135 +++++++++ .../lang/GridMetadataAwareAdapterSelfTest.java | 58 ++-- 32 files changed, 409 insertions(+), 796 deletions(-) ----------------------------------------------------------------------
