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 "BUG-190 Simplify reconnect logic in protocol-framework."
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
utils
/
MockActorContext.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/MockActorContext.java
b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/MockActorContext.java
index fe62516098253c8dbe9f19424854578c1fe0120f..1d1e6614886e32d5593112375cbefaab0a9c1507 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/MockActorContext.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/MockActorContext.java
@@
-21,11
+21,11
@@
public class MockActorContext extends ActorContext {
private Object executeLocalOperationResponse;
public MockActorContext(ActorSystem actorSystem) {
private Object executeLocalOperationResponse;
public MockActorContext(ActorSystem actorSystem) {
- super(actorSystem, null);
+ super(actorSystem, null
, new MockClusterWrapper(), new MockConfiguration()
);
}
public MockActorContext(ActorSystem actorSystem, ActorRef shardManager) {
}
public MockActorContext(ActorSystem actorSystem, ActorRef shardManager) {
- super(actorSystem, shardManager);
+ super(actorSystem, shardManager
, new MockClusterWrapper(), new MockConfiguration()
);
}
}
@@
-56,5
+56,8
@@
public class MockActorContext extends ActorContext {
this.executeLocalOperationResponse = executeLocalOperationResponse;
}
this.executeLocalOperationResponse = executeLocalOperationResponse;
}
-
+ @Override public Object executeLocalOperation(ActorRef actor,
+ Object message, FiniteDuration duration) {
+ return this.executeLocalOperationResponse;
+ }
}
}