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 "Fix NoSuchElementException thrown when transaction is empty"
[controller.git]
/
opendaylight
/
md-sal
/
sal-akka-raft
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
raft
/
RaftActor.java
diff --git
a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActor.java
b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActor.java
index 4a2ab9936f5e4327c7d6eeb35df10416b2ee807f..4485f3b14457c5f61fe614eaaec226218d0ab3a4 100644
(file)
--- a/
opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActor.java
+++ b/
opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActor.java
@@
-127,7
+127,7
@@
public abstract class RaftActor extends AbstractUntypedPersistentActor {
(configParams.isPresent() ? configParams.get(): new DefaultConfigParamsImpl()),
delegatingPersistenceProvider, LOG);
(configParams.isPresent() ? configParams.get(): new DefaultConfigParamsImpl()),
delegatingPersistenceProvider, LOG);
- context.setReplicatedLog(ReplicatedLogImpl.newInstance(context,
delegatingPersistenceProvider,
currentBehavior));
+ context.setReplicatedLog(ReplicatedLogImpl.newInstance(context, currentBehavior));
}
@Override
}
@Override
@@
-179,8
+179,7
@@
public abstract class RaftActor extends AbstractUntypedPersistentActor {
}
protected RaftActorRecoverySupport newRaftActorRecoverySupport() {
}
protected RaftActorRecoverySupport newRaftActorRecoverySupport() {
- return new RaftActorRecoverySupport(delegatingPersistenceProvider, context, currentBehavior,
- getRaftActorRecoveryCohort());
+ return new RaftActorRecoverySupport(context, currentBehavior, getRaftActorRecoveryCohort());
}
protected void initializeBehavior(){
}
protected void initializeBehavior(){
@@
-238,8
+237,8
@@
public abstract class RaftActor extends AbstractUntypedPersistentActor {
}
protected RaftActorSnapshotMessageSupport newRaftActorSnapshotMessageSupport() {
}
protected RaftActorSnapshotMessageSupport newRaftActorSnapshotMessageSupport() {
- return new RaftActorSnapshotMessageSupport(
delegatingPersistenceProvider, context
,
-
currentBehavior,
getRaftActorSnapshotCohort());
+ return new RaftActorSnapshotMessageSupport(
context, currentBehavior
,
+ getRaftActorSnapshotCohort());
}
private void onGetOnDemandRaftStats() {
}
private void onGetOnDemandRaftStats() {