grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a concurrent modification in BlankFutureProvider. 

The Set from Collections.synchronizedSet() is not protected against
concurrent modification during iteration. We copy an ArrayList out of it
for iteration.
This commit is contained in:
Kun Zhang 2016-01-28 11:01:22 -08:00
parent e2ed2e8f03
commit ba54513f5c
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/main/java/io/grpc/internal/BlankFutureProvider.java
View File

@ -39,8 +39,10 @@ import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.SettableFuture;
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import java.util.concurrent.CancellationException;
@ -122,7 +124,7 @@ public final class BlankFutureProvider<T> {
* they were created.
*/
public void link(Supplier<ListenableFuture<T>> source) {
for (final SettableFuture<T> future : futures) {
for (final SettableFuture<T> future : copyFutureList()) {
ListenableFuture<T> sourceFuture = source.get();
Futures.addCallback(sourceFuture, new FutureCallback<T>() {
@Override public void onSuccess(T result) {
@ -140,10 +142,16 @@ public final class BlankFutureProvider<T> {
* Fails all futures with the given error.
*/
public void fail(Throwable error) {
for (SettableFuture<T> future : futures) {
for (SettableFuture<T> future : copyFutureList()) {
future.setException(error);
}
}
private List<SettableFuture<T>> copyFutureList() {
synchronized (futures) {
return new ArrayList<SettableFuture<T>>(futures);
}
}
}
private static <T> Set<SettableFuture<T>> createSet() {