ninja: fix fat finger regression between +1 and commit for CASSANDRA-14660
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d049c6b9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d049c6b9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d049c6b9 Branch: refs/heads/trunk Commit: d049c6b9b4af4f663aac2bf90d860c3b0c20684a Parents: 66db8d4 Author: Benedict Elliott Smith <[email protected]> Authored: Fri Aug 24 17:29:08 2018 +0100 Committer: Benedict Elliott Smith <[email protected]> Committed: Fri Aug 24 17:29:08 2018 +0100 ---------------------------------------------------------------------- src/java/org/apache/cassandra/utils/SortedBiMultiValMap.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d049c6b9/src/java/org/apache/cassandra/utils/SortedBiMultiValMap.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/SortedBiMultiValMap.java b/src/java/org/apache/cassandra/utils/SortedBiMultiValMap.java index f628061..e8bcee1 100644 --- a/src/java/org/apache/cassandra/utils/SortedBiMultiValMap.java +++ b/src/java/org/apache/cassandra/utils/SortedBiMultiValMap.java @@ -65,7 +65,7 @@ public class SortedBiMultiValMap<K, V> extends BiMultiValMap<K, V> private static <K, V> void copy(BiMultiValMap<K, V> map, BiMultiValMap<K, V> newMap) { - newMap.forwardMap.putAll(map); + newMap.forwardMap.putAll(map.forwardMap); // Put each individual TreeSet instead of Multimap#putAll(Multimap) to get linear complexity // See CASSANDRA-14660 for (Entry<V, Collection<K>> entry : map.inverse().asMap().entrySet()) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
