Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bump odlparent to 5.0.0
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
databroker
/
actors
/
dds
/
VotingFuture.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/VotingFuture.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/VotingFuture.java
index 01298dfabfcef1c37e0eaeb0e8ded68a6e975b68..f9fffea025bbcdbe3952ae28bfbf084e12364129 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/VotingFuture.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/VotingFuture.java
@@
-14,7
+14,8
@@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.Collection;
import java.util.Iterator;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
-import javax.annotation.concurrent.GuardedBy;
+import org.checkerframework.checker.lock.qual.GuardedBy;
+import org.checkerframework.checker.lock.qual.Holding;
/**
* An {@link AbstractFuture} implementation which requires a certain number of votes before it completes. If all votes
/**
* An {@link AbstractFuture} implementation which requires a certain number of votes before it completes. If all votes
@@
-73,7
+74,7
@@
class VotingFuture<T> extends AbstractFuture<T> {
return votes == 0;
}
return votes == 0;
}
- @
GuardedBy
("failures")
+ @
Holding
("failures")
private void resolveResult() {
final Iterator<Throwable> it = failures.iterator();
if (!it.hasNext()) {
private void resolveResult() {
final Iterator<Throwable> it = failures.iterator();
if (!it.hasNext()) {