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 "Startup archetype: remove 'Impl' from config subsystem Module name."
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
messages
/
MergeData.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/MergeData.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/MergeData.java
index 9234385b3536bfbe8ccaf528075efcdedc1be792..ae0d630cf267aa75b0ef403b8df7e7733d06e082 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/MergeData.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/MergeData.java
@@
-55,7
+55,7
@@
public class MergeData extends ModifyData implements VersionedSerializableMessag
}
public static boolean isSerializedType(Object message) {
- return SERIALIZABLE_CLASS.is
AssignableFrom(message.getClass()
) ||
+ return SERIALIZABLE_CLASS.is
Instance(message
) ||
message instanceof ShardTransactionMessages.MergeData;
}
}