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
/
ShardManagerSnapshot.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ShardManagerSnapshot.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ShardManagerSnapshot.java
index 6bb6ea8b304fe53a307041f12cf3c69cb3e462c2..728dd29ea3232c081dc0f5f0930f7185c514f287 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ShardManagerSnapshot.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ShardManagerSnapshot.java
@@
-15,7
+15,7
@@
import java.io.ObjectOutput;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import
javax.annotation.Nonn
ull;
+import
org.eclipse.jdt.annotation.NonN
ull;
/**
* Represents the persisted snapshot state for the ShardManager.
/**
* Represents the persisted snapshot state for the ShardManager.
@@
-42,7
+42,7
@@
public class ShardManagerSnapshot implements Serializable {
}
@Override
}
@Override
- public void writeExternal(ObjectOutput out) throws IOException {
+ public void writeExternal(
final
ObjectOutput out) throws IOException {
out.writeInt(snapshot.shardList.size());
for (String shard: snapshot.shardList) {
out.writeObject(shard);
out.writeInt(snapshot.shardList.size());
for (String shard: snapshot.shardList) {
out.writeObject(shard);
@@
-50,14
+50,14
@@
public class ShardManagerSnapshot implements Serializable {
}
@Override
}
@Override
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+ public void readExternal(
final
ObjectInput in) throws IOException, ClassNotFoundException {
int size = in.readInt();
int size = in.readInt();
- List<String>
s
hardList = new ArrayList<>(size);
+ List<String>
localS
hardList = new ArrayList<>(size);
for (int i = 0; i < size; i++) {
for (int i = 0; i < size; i++) {
-
s
hardList.add((String) in.readObject());
+
localS
hardList.add((String) in.readObject());
}
}
- snapshot = new ShardManagerSnapshot(
s
hardList);
+ snapshot = new ShardManagerSnapshot(
localS
hardList);
}
private Object readResolve() {
}
private Object readResolve() {
@@
-67,7
+67,7
@@
public class ShardManagerSnapshot implements Serializable {
private final List<String> shardList;
private final List<String> shardList;
- public ShardManagerSnapshot(
@Nonnull fina
l List<String> shardList) {
+ public ShardManagerSnapshot(
final @NonNul
l List<String> shardList) {
this.shardList = ImmutableList.copyOf(shardList);
}
this.shardList = ImmutableList.copyOf(shardList);
}
@@
-75,7
+75,6
@@
public class ShardManagerSnapshot implements Serializable {
return this.shardList;
}
return this.shardList;
}
- @SuppressWarnings("static-method")
private Object writeReplace() {
return new Proxy(this);
}
private Object writeReplace() {
return new Proxy(this);
}