Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ae148f1c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ae148f1c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ae148f1c Branch: refs/heads/ignite-104 Commit: ae148f1c5ea551b0d6cac3e82cfcff21197c88e0 Parents: fcf5ecb ed5d3ed Author: ashutak <ashu...@gridgain.com> Authored: Fri Jul 24 12:42:27 2015 +0300 Committer: ashutak <ashu...@gridgain.com> Committed: Fri Jul 24 12:42:27 2015 +0300 ---------------------------------------------------------------------- .../rest/protocols/tcp/MockNioSession.java | 15 - .../store/jdbc/CacheJdbcBlobStoreFactory.java | 2 +- .../apache/ignite/internal/IgniteKernal.java | 5 + .../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 ++-- 34 files changed, 415 insertions(+), 797 deletions(-) ----------------------------------------------------------------------
