Merge branches 'ignite-884' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-884
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/794f2a00 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/794f2a00 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/794f2a00 Branch: refs/heads/ignite-884 Commit: 794f2a00db3783081b7f4069cf82b827f801761f Parents: 4243b38 f62744e Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Mon Jul 20 13:40:28 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Mon Jul 20 13:40:28 2015 -0700 ---------------------------------------------------------------------- .../ignite/compute/ComputeJobResultPolicy.java | 3 +- .../failover/GridFailoverContextImpl.java | 28 ++- .../managers/failover/GridFailoverManager.java | 13 +- .../processors/cache/GridCacheAdapter.java | 2 +- .../processors/cache/GridCacheUtils.java | 4 +- .../processors/cache/IgniteCacheProxy.java | 2 +- .../processors/cache/IgniteInternalCache.java | 1 + .../distributed/dht/GridDhtTxPrepareFuture.java | 9 +- .../processors/closure/AffinityTask.java | 35 ++++ .../closure/GridClosureProcessor.java | 63 ++++++- .../processors/task/GridTaskWorker.java | 24 ++- .../ignite/internal/util/IgniteUtils.java | 8 +- .../plugin/security/SecurityPermission.java | 7 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 8 +- .../ignite/spi/failover/FailoverContext.java | 18 ++ .../spi/failover/always/AlwaysFailoverSpi.java | 25 +++ .../IgniteClientReconnectFailoverTest.java | 53 ++++-- .../cache/CacheAffinityCallSelfTest.java | 178 +++++++++++++++++++ .../cache/GridCacheAffinityRoutingSelfTest.java | 157 +++++++++++++++- .../cache/IgniteCacheNearLockValueSelfTest.java | 2 + .../IgniteCachePutRetryAbstractSelfTest.java | 52 ++++-- ...gniteCachePutRetryTransactionalSelfTest.java | 17 +- ...achePartitionedMultiNodeFullApiSelfTest.java | 4 +- .../spi/failover/GridFailoverTestContext.java | 10 ++ .../ignite/testsuites/IgniteCacheTestSuite.java | 1 + .../ignite/schema/ui/SchemaImportApp.java | 36 +++- pom.xml | 12 +- 27 files changed, 676 insertions(+), 96 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/794f2a00/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java ----------------------------------------------------------------------