natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix ConcurrentModificationException in getBootstrapSource

This commit is contained in:
Jonathan Ellis 2013-01-18 12:56:24 -08:00
parent be01197786
commit a7da0295d5
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -1,5 +1,7 @@
1.1.10
* fix saved key cache not loading at startup (CASSANDRA-5166)
* fix ConcurrentModificationException in getBootstrapSource (CASSANDRA-5170)
1.1.9
* Simplify CompressedRandomAccessReader to work around JDK FD bug (CASSANDRA-5088)

6
src/java/org/apache/cassandra/service/LoadBroadcaster.java
View File

@ -20,6 +20,8 @@ package org.apache.cassandra.service;
import java.net.InetAddress;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.TimeUnit;
import org.slf4j.Logger;
@ -35,7 +37,7 @@ public class LoadBroadcaster implements IEndpointStateChangeSubscriber
private static final Logger logger_ = LoggerFactory.getLogger(LoadBroadcaster.class);
private Map<InetAddress, Double> loadInfo_ = new HashMap<InetAddress, Double>();
private ConcurrentMap<InetAddress, Double> loadInfo_ = new ConcurrentHashMap<InetAddress, java.lang.Double>();
private LoadBroadcaster()
{
@ -71,7 +73,7 @@ public class LoadBroadcaster implements IEndpointStateChangeSubscriber
public Map<InetAddress, Double> getLoadInfo()
{
return loadInfo_;
return Collections.unmodifiableMap(loadInfo_);
}
public void startBroadcasting()