Repository: ignite Updated Branches: refs/heads/master 0b3718f60 -> 7256e5752
IGNITE-10385 Avoid NPE by replacing null fields with zero-length arrays - Fixes #5487. Signed-off-by: Ilya Kasnacheev <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7256e575 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7256e575 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7256e575 Branch: refs/heads/master Commit: 7256e5752084118fc1530eb1893ffab8ba733e0c Parents: 0b3718f Author: antkr <[email protected]> Authored: Fri Dec 28 16:53:57 2018 +0300 Committer: Ilya Kasnacheev <[email protected]> Committed: Fri Dec 28 16:53:57 2018 +0300 ---------------------------------------------------------------------- .../preloader/CachePartitionPartialCountersMap.java | 2 +- .../CachePartitionPartialCountersMapSelfTest.java | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7256e575/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionPartialCountersMap.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionPartialCountersMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionPartialCountersMap.java index 2ff875d..986a100 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionPartialCountersMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionPartialCountersMap.java @@ -53,7 +53,7 @@ public class CachePartitionPartialCountersMap implements Serializable { /** */ private CachePartitionPartialCountersMap() { - // Empty map. + this(0); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/7256e575/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/CachePartitionPartialCountersMapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/CachePartitionPartialCountersMapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/CachePartitionPartialCountersMapSelfTest.java index c594121..08c6259 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/CachePartitionPartialCountersMapSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/CachePartitionPartialCountersMapSelfTest.java @@ -23,9 +23,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +/** + * + */ @RunWith(JUnit4.class) public class CachePartitionPartialCountersMapSelfTest extends GridCommonAbstractTest { - + /** */ @Test public void testAddAndRemove() throws Exception { CachePartitionPartialCountersMap map = new CachePartitionPartialCountersMap(10); @@ -59,4 +62,15 @@ public class CachePartitionPartialCountersMapSelfTest extends GridCommonAbstract } } + /** */ + @Test + public void testEmptyMap() throws Exception { + CachePartitionPartialCountersMap map = CachePartitionPartialCountersMap.EMPTY; + + assertFalse(map.remove(1)); + + map.trim(); + + assertNotNull(map.toString()); + } }
