Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Adjust to yangtools-2.0.0 changes
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
ThreePhaseCommitCohortProxyTest.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ThreePhaseCommitCohortProxyTest.java
b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ThreePhaseCommitCohortProxyTest.java
index dadd3a99f7f8d0def3b7025d0206c3098d4cb907..ba7295bcea75a7a3b4f9806549065211a0290f13 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ThreePhaseCommitCohortProxyTest.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ThreePhaseCommitCohortProxyTest.java
@@
-260,8
+260,8
@@
public class ThreePhaseCommitCohortProxyTest extends AbstractActorTest {
verifyCohortActors();
}
verifyCohortActors();
}
+ @SuppressWarnings("checkstyle:avoidHidingCauseException")
private void propagateExecutionExceptionCause(final ListenableFuture<?> future) throws Exception {
private void propagateExecutionExceptionCause(final ListenableFuture<?> future) throws Exception {
-
try {
future.get(5, TimeUnit.SECONDS);
fail("Expected ExecutionException");
try {
future.get(5, TimeUnit.SECONDS);
fail("Expected ExecutionException");
@@
-315,7
+315,7
@@
public class ThreePhaseCommitCohortProxyTest extends AbstractActorTest {
private final AtomicInteger abortCount = new AtomicInteger();
private volatile AssertionError assertionError;
private final AtomicInteger abortCount = new AtomicInteger();
private volatile AssertionError assertionError;
-
private
CohortActor(final Builder builder) {
+ CohortActor(final Builder builder) {
this.builder = builder;
}
this.builder = builder;
}