Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
BUG-8056: make doCommit/finishCommit package-private
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
messages
/
VersionedExternalizableMessage.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/VersionedExternalizableMessage.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/VersionedExternalizableMessage.java
index 60f51ddf5e7a94754d96fe3d5fc4f6275c743cb4..781580a643ec3e03a98e26327fb2a5374b41d319 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/VersionedExternalizableMessage.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/VersionedExternalizableMessage.java
@@
-27,7
+27,7
@@
public abstract class VersionedExternalizableMessage implements Externalizable,
}
public VersionedExternalizableMessage(short version) {
}
public VersionedExternalizableMessage(short version) {
- this.version = version <= DataStoreVersions.CURRENT_VERSION ? version: DataStoreVersions.CURRENT_VERSION;
+ this.version = version <= DataStoreVersions.CURRENT_VERSION ? version
: DataStoreVersions.CURRENT_VERSION;
}
public short getVersion() {
}
public short getVersion() {
@@
-44,15
+44,14
@@
public abstract class VersionedExternalizableMessage implements Externalizable,
out.writeShort(version);
}
out.writeShort(version);
}
- /**
- * @deprecated Pre-Boron compatibility.
- */
- @Deprecated
- protected abstract Object newLegacySerializedInstance();
-
@Override
public final Object toSerializable() {
@Override
public final Object toSerializable() {
- return getVersion() >= DataStoreVersions.BORON_VERSION ? this : newLegacySerializedInstance();
+ if (getVersion() < DataStoreVersions.BORON_VERSION) {
+ throw new UnsupportedOperationException("Versions prior to " + DataStoreVersions.BORON_VERSION
+ + " are not supported");
+ }
+
+ return this;
}
@Override
}
@Override