Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
NormalizedNodeAggregator should also report empty
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
persisted
/
AbstractVersionedShardDataTreeSnapshot.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractVersionedShardDataTreeSnapshot.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractVersionedShardDataTreeSnapshot.java
index 0667f7c0397d367956742d4affb7b326d52ca50d..5e85434e4aa38bba477a3b64bc470a961be317f8 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractVersionedShardDataTreeSnapshot.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractVersionedShardDataTreeSnapshot.java
@@
-31,8
+31,6
@@
abstract class AbstractVersionedShardDataTreeSnapshot extends ShardDataTreeSnaps
static @NonNull ShardSnapshotState versionedDeserialize(final ObjectInput in) throws IOException {
final PayloadVersion version = PayloadVersion.readFrom(in);
switch (version) {
static @NonNull ShardSnapshotState versionedDeserialize(final ObjectInput in) throws IOException {
final PayloadVersion version = PayloadVersion.readFrom(in);
switch (version) {
- case BORON:
- case NEON_SR2:
case SODIUM_SR1:
return new ShardSnapshotState(readSnapshot(in), true);
case MAGNESIUM:
case SODIUM_SR1:
return new ShardSnapshotState(readSnapshot(in), true);
case MAGNESIUM:
@@
-42,7
+40,7
@@
abstract class AbstractVersionedShardDataTreeSnapshot extends ShardDataTreeSnaps
// These versions are never returned and this code is effectively dead
default:
// Not included as default in above switch to ensure we get warnings when new versions are added
// These versions are never returned and this code is effectively dead
default:
// Not included as default in above switch to ensure we get warnings when new versions are added
- throw new IOException("Encountered unhandled version" + version);
+ throw new IOException("Encountered unhandled version
" + version);
}
}
}
}
@@
-77,11
+75,9
@@
abstract class AbstractVersionedShardDataTreeSnapshot extends ShardDataTreeSnaps
private void versionedSerialize(final ObjectOutput out, final PayloadVersion version) throws IOException {
switch (version) {
private void versionedSerialize(final ObjectOutput out, final PayloadVersion version) throws IOException {
switch (version) {
- case BORON:
- case NEON_SR2:
case SODIUM_SR1:
case MAGNESIUM:
case SODIUM_SR1:
case MAGNESIUM:
- //
Boron, NeonSR2,
Sodium and Magnesium snapshots use Java Serialization, but differ in stream format
+ // Sodium and Magnesium snapshots use Java Serialization, but differ in stream format
out.writeObject(this);
return;
case TEST_FUTURE_VERSION:
out.writeObject(this);
return;
case TEST_FUTURE_VERSION: