You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ni...@apache.org on 2018/04/02 19:07:24 UTC
ignite git commit: IGNITE-7931: Wrong arguments for ConcurrentHashMap
- Fixes #3646.
Repository: ignite
Updated Branches:
refs/heads/master ef27473f0 -> 59b5ee1cb
IGNITE-7931: Wrong arguments for ConcurrentHashMap - Fixes #3646.
Signed-off-by: Nikolay Izhikov <ni...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/59b5ee1c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/59b5ee1c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/59b5ee1c
Branch: refs/heads/master
Commit: 59b5ee1cb5c2979de0949ff21bddfe7c8ef7a54c
Parents: ef27473
Author: Fedotov <va...@gmail.com>
Authored: Mon Apr 2 22:01:05 2018 +0300
Committer: Nikolay Izhikov <ni...@apache.org>
Committed: Mon Apr 2 22:01:05 2018 +0300
----------------------------------------------------------------------
.../main/java/org/apache/ignite/internal/binary/BinaryUtils.java | 4 ++--
.../internal/processors/datastreamer/DataStreamerImpl.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/59b5ee1c/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
index 2ef57e1..1f167f5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
@@ -667,7 +667,7 @@ public class BinaryUtils {
else if (!wrapTrees() && cls == TreeMap.class)
return new TreeMap<>(((TreeMap<Object, Object>)map).comparator());
else if (cls == ConcurrentHashMap.class)
- return new ConcurrentHashMap<>(U.capacity(((Map)map).size()));
+ return new ConcurrentHashMap<>(((Map)map).size());
return null;
}
@@ -685,7 +685,7 @@ public class BinaryUtils {
else if (map instanceof TreeMap)
return new TreeMap<>(((TreeMap<Object, Object>)map).comparator());
else if (map instanceof ConcurrentHashMap)
- return new ConcurrentHashMap<>(U.capacity(map.size()));
+ return new ConcurrentHashMap<>(map.size());
return U.newHashMap(map.size());
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/59b5ee1c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
index 1df8d57..4a893f4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
@@ -571,7 +571,7 @@ public class DataStreamerImpl<K, V> implements IgniteDataStreamer<K, V>, Delayed
activeFuts.add(resFut);
Collection<KeyCacheObjectWrapper> keys =
- new GridConcurrentHashSet<>(entries.size(), U.capacity(entries.size()), 1);
+ new GridConcurrentHashSet<>(entries.size());
Collection<DataStreamerEntry> entries0 = new ArrayList<>(entries.size());
@@ -630,7 +630,7 @@ public class DataStreamerImpl<K, V> implements IgniteDataStreamer<K, V>, Delayed
Collection<KeyCacheObjectWrapper> keys = null;
if (entries.size() > 1) {
- keys = new GridConcurrentHashSet<>(entries.size(), U.capacity(entries.size()), 1);
+ keys = new GridConcurrentHashSet<>(entries.size());
for (DataStreamerEntry entry : entries)
keys.add(new KeyCacheObjectWrapper(entry.getKey()));