Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Created Proper Feature File for AD-SAL"
[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 af3da575714c57d3b39786313a089d63d6419615..8ff785c8797eecb166c0381ab3e7a92980fa8396 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
@@
-14,6
+14,8
@@
import org.opendaylight.controller.cluster.datastore.utils.MessageCollectorActor
import org.opendaylight.controller.cluster.datastore.utils.MockActorContext;
import java.util.Arrays;
import org.opendaylight.controller.cluster.datastore.utils.MockActorContext;
import java.util.Arrays;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotNull;
@@
-23,6
+25,7
@@
public class ThreePhaseCommitCohortProxyTest extends AbstractActorTest {
private Props props;
private ActorRef actorRef;
private MockActorContext actorContext;
private Props props;
private ActorRef actorRef;
private MockActorContext actorContext;
+ private ExecutorService executor = Executors.newSingleThreadExecutor();
@Before
public void setUp(){
@Before
public void setUp(){
@@
-32,7
+35,7
@@
public class ThreePhaseCommitCohortProxyTest extends AbstractActorTest {
proxy =
new ThreePhaseCommitCohortProxy(actorContext,
proxy =
new ThreePhaseCommitCohortProxy(actorContext,
- Arrays.asList(actorRef.path()));
+ Arrays.asList(actorRef.path())
, "txn-1", executor
);
}
}