Merge remote-tracking branch 'remotes/community/ignite-1.6.3' # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java # modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/42f42eac Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/42f42eac Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/42f42eac Branch: refs/heads/ignite-3443 Commit: 42f42eac58c718f7debdd5f6e1ed989bae48de69 Parents: da56370 Author: sboikov <[email protected]> Authored: Wed Jul 27 10:17:36 2016 +0300 Committer: sboikov <[email protected]> Committed: Wed Jul 27 10:17:36 2016 +0300 ---------------------------------------------------------------------- .../dht/GridDhtPartitionTopologyImpl.java | 16 ++-------------- .../org/apache/ignite/spring-injection-test.xml | 2 +- 2 files changed, 3 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/42f42eac/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java index 1299d20..558a654 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java @@ -181,18 +181,6 @@ class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology { private boolean waitForRent() throws IgniteCheckedException { boolean changed = false; - GridDhtLocalPartition[] locPartsCopy = new GridDhtLocalPartition[locParts.length]; - - lock.readLock().lock(); - - try { - for (int i = 0; i < locParts.length; i++) - locPartsCopy[i] = locParts[i]; - } - finally { - lock.readLock().unlock(); - } - final long longOpDumpTimeout = IgniteSystemProperties.getLong(IgniteSystemProperties.IGNITE_LONG_OPERATIONS_DUMP_TIMEOUT, 60_000); @@ -200,8 +188,8 @@ class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology { GridDhtLocalPartition part; - for (int i = 0; i < locPartsCopy.length(); i++) { - part = locPartsCopy.get(i); + for (int i = 0; i < locParts.length(); i++) { + part = locParts.get(i); if (part == null) continue; http://git-wip-us.apache.org/repos/asf/ignite/blob/42f42eac/modules/spring/src/test/java/org/apache/ignite/spring-injection-test.xml ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/apache/ignite/spring-injection-test.xml b/modules/spring/src/test/java/org/apache/ignite/spring-injection-test.xml index b8368a3..7401986 100644 --- a/modules/spring/src/test/java/org/apache/ignite/spring-injection-test.xml +++ b/modules/spring/src/test/java/org/apache/ignite/spring-injection-test.xml @@ -18,7 +18,7 @@ --> <!-- - GridGain Spring configuration file to startup grid cache. + Ignite Spring configuration file to startup grid cache. --> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
