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-2627: do not duplicate descriptions"
[controller.git]
/
opendaylight
/
md-sal
/
sal-akka-raft
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
example
/
ExampleActor.java
diff --git
a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/example/ExampleActor.java
b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/example/ExampleActor.java
index 8f416b3abc45145e2f95307332052b66cdb4b5a1..c5ae4c41b2f4822a04ca9da300171ae2e618d52e 100644
(file)
--- a/
opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/example/ExampleActor.java
+++ b/
opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/example/ExampleActor.java
@@
-41,7
+41,7
@@
public class ExampleActor extends RaftActor {
private final DataPersistenceProvider dataPersistenceProvider;
private long persistIdentifier = 1;
private final DataPersistenceProvider dataPersistenceProvider;
private long persistIdentifier = 1;
- private Optional<ActorRef> roleChangeNotifier;
+ private
final
Optional<ActorRef> roleChangeNotifier;
public ExampleActor(String id, Map<String, String> peerAddresses,
public ExampleActor(String id, Map<String, String> peerAddresses,
@@
-125,17
+125,17
@@
public class ExampleActor extends RaftActor {
try {
bs = fromObject(state);
} catch (Exception e) {
try {
bs = fromObject(state);
} catch (Exception e) {
- LOG.error(
e, "Exception in creating snapshot"
);
+ LOG.error(
"Exception in creating snapshot", e
);
}
}
- getSelf().tell(new CaptureSnapshotReply(bs), null);
+ getSelf().tell(new CaptureSnapshotReply(bs
.toByteArray()
), null);
}
}
- @Override protected void applySnapshot(
ByteString
snapshot) {
+ @Override protected void applySnapshot(
byte []
snapshot) {
state.clear();
try {
state.putAll((HashMap) toObject(snapshot));
} catch (Exception e) {
state.clear();
try {
state.putAll((HashMap) toObject(snapshot));
} catch (Exception e) {
- LOG.error(
e, "Exception in applying snapshot"
);
+ LOG.error(
"Exception in applying snapshot", e
);
}
if(LOG.isDebugEnabled()) {
LOG.debug("Snapshot applied to state : {}", ((HashMap) state).size());
}
if(LOG.isDebugEnabled()) {
LOG.debug("Snapshot applied to state : {}", ((HashMap) state).size());
@@
-162,12
+162,12
@@
public class ExampleActor extends RaftActor {
}
}
}
}
- private Object toObject(
ByteString
bs) throws ClassNotFoundException, IOException {
+ private Object toObject(
byte []
bs) throws ClassNotFoundException, IOException {
Object obj = null;
ByteArrayInputStream bis = null;
ObjectInputStream ois = null;
try {
Object obj = null;
ByteArrayInputStream bis = null;
ObjectInputStream ois = null;
try {
- bis = new ByteArrayInputStream(bs
.toByteArray()
);
+ bis = new ByteArrayInputStream(bs);
ois = new ObjectInputStream(bis);
obj = ois.readObject();
} finally {
ois = new ObjectInputStream(bis);
obj = ois.readObject();
} finally {
@@
-215,6
+215,6
@@
public class ExampleActor extends RaftActor {
}
@Override
}
@Override
- protected void applyRecoverySnapshot(
ByteString
snapshot) {
+ protected void applyRecoverySnapshot(
byte[]
snapshot) {
}
}
}
}