Merge remote-tracking branch 'origin/sprint-2' into sprint-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1692ce69 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1692ce69 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1692ce69 Branch: refs/heads/ignite-410 Commit: 1692ce69153872d2552f5c98b42baec1c47c919e Parents: 38d1e70 82af96c Author: vozerov-gridgain <voze...@gridgain.com> Authored: Tue Mar 10 18:08:15 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Tue Mar 10 18:08:15 2015 +0300 ---------------------------------------------------------------------- .../rest/protocols/tcp/MockNioSession.java | 7 +- .../processors/cache/EvictableEntryImpl.java | 4 +- .../processors/cache/GridCacheAdapter.java | 2 +- .../processors/cache/GridCacheEntryEx.java | 28 ++----- .../cache/GridCacheEvictionManager.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 50 ++++-------- .../processors/cache/GridCacheStoreManager.java | 2 +- .../processors/cache/GridCacheUtils.java | 10 +-- .../extras/GridCacheAttributesEntryExtras.java | 10 ++- .../GridCacheAttributesMvccEntryExtras.java | 10 ++- ...dCacheAttributesMvccObsoleteEntryExtras.java | 10 ++- ...cheAttributesMvccObsoleteTtlEntryExtras.java | 10 ++- .../GridCacheAttributesMvccTtlEntryExtras.java | 10 ++- .../GridCacheAttributesObsoleteEntryExtras.java | 10 ++- ...idCacheAttributesObsoleteTtlEntryExtras.java | 10 ++- .../GridCacheAttributesTtlEntryExtras.java | 10 ++- .../cache/extras/GridCacheEntryExtras.java | 6 +- .../extras/GridCacheEntryExtrasAdapter.java | 4 +- .../cache/extras/GridCacheMvccEntryExtras.java | 4 +- .../GridCacheMvccObsoleteEntryExtras.java | 4 +- .../GridCacheMvccObsoleteTtlEntryExtras.java | 4 +- .../extras/GridCacheMvccTtlEntryExtras.java | 4 +- .../extras/GridCacheObsoleteEntryExtras.java | 4 +- .../extras/GridCacheObsoleteTtlEntryExtras.java | 4 +- .../cache/extras/GridCacheTtlEntryExtras.java | 4 +- .../cache/transactions/IgniteInternalTx.java | 6 +- .../cache/transactions/IgniteTxAdapter.java | 6 +- .../transactions/TransactionProxyImpl.java | 6 +- .../util/lang/GridMetadataAwareAdapter.java | 71 +++++------------ .../apache/ignite/transactions/Transaction.java | 6 +- .../cache/eviction/GridCacheMockEntry.java | 5 +- .../nio/impl/GridNioFilterChainSelfTest.java | 7 +- .../lang/GridMetadataAwareAdapterSelfTest.java | 80 +++++++++++--------- 33 files changed, 198 insertions(+), 212 deletions(-) ----------------------------------------------------------------------
