Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-565
Conflicts:
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientAffinityAssignmentSelfTest.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/659aecc4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/659aecc4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/659aecc4
Branch: refs/heads/ignite-424
Commit: 659aecc4cc6fd1cb5f1f6c2b6d4734f0afcb4c45
Parents: 75ea413 8aaa5ce
Author: ivasilinets <ivasilin...@gridgain.com>
Authored: Fri Mar 27 11:23:38 2015 +0300
Committer: ivasilinets <ivasilin...@gridgain.com>
Committed: Fri Mar 27 11:23:38 2015 +0300
----------------------------------------------------------------------
assembly/libs/README.txt | 1 -
modules/core/pom.xml | 14 ++-
.../org/apache/ignite/events/CacheEvent.java | 13 ++-
.../ignite/events/CacheRebalancingEvent.java | 2 +-
.../org/apache/ignite/events/EventType.java | 41 ++++----
.../internal/MarshallerContextAdapter.java | 5 +-
.../ignite/internal/MarshallerContextImpl.java | 65 ++++++-------
.../discovery/GridDiscoveryManager.java | 7 +-
.../dht/GridDhtPartitionTopologyImpl.java | 5 +-
.../preloader/GridDhtPartitionDemandPool.java | 15 +--
.../visor/event/VisorGridEventsLost.java | 7 +-
.../ignite/lang/IgniteProductVersion.java | 2 +-
.../ignite/marshaller/MarshallerContext.java | 5 +-
.../optimized/OptimizedMarshallerUtils.java | 2 +-
.../org/jsr166/ConcurrentLinkedHashMap.java | 9 ++
.../GridProjectionForCachesSelfTest.java | 2 +-
...idCacheValueConsistencyAbstractSelfTest.java | 45 ++++++++-
...heValueConsistencyTransactionalSelfTest.java | 2 +-
.../IgniteClientAffinityAssignmentSelfTest.java | 99 ++++++++++++++++----
...ridCachePartitionNotLoadedEventSelfTest.java | 8 +-
...sistencyAtomicPrimaryWriteOrderSelfTest.java | 32 +++++++
...GridCacheValueConsistencyAtomicSelfTest.java | 2 +-
.../GridConcurrentLinkedHashMapSelfTest.java | 17 ++++
.../ignite/testsuites/IgniteCacheTestSuite.java | 1 +
24 files changed, 290 insertions(+), 111 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/659aecc4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/659aecc4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientAffinityAssignmentSelfTest.java
----------------------------------------------------------------------
diff --cc
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientAffinityAssignmentSelfTest.java
index 3ec69a0,5c52cca..a14fa79
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientAffinityAssignmentSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientAffinityAssignmentSelfTest.java
@@@ -129,10 -172,13 +172,13 @@@ public class IgniteClientAffinityAssign
}
/**
+ * @param topVer Topology version.
* @throws Exception If failed.
*/
- private void checkAffinity() throws Exception {
+ private void checkAffinity(long topVer) throws Exception {
+ awaitTopology(topVer);
+
- Affinity<Object> aff =
((IgniteKernal)grid(0)).getCache(null).affinity();
+ Affinity<Object> aff = grid(0).affinity(null);
for (Ignite grid : Ignition.allGrids()) {
try {
