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 changes Ibe016728,Ic719c519,I87a81a54
[controller.git]
/
opendaylight
/
md-sal
/
sal-remoterpc-connector
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
remote
/
rpc
/
registry
/
gossip
/
BucketStore.java
diff --git
a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/BucketStore.java
b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/BucketStore.java
index 628deb4311cebe1da5ff1b44deb715d933b8b8b2..febff0bc92efc4c8ad896a92e3d367156c6fd345 100644
(file)
--- a/
opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/BucketStore.java
+++ b/
opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/BucketStore.java
@@
-13,7
+13,6
@@
import akka.actor.ActorRefProvider;
import akka.actor.Address;
import akka.actor.Props;
import akka.cluster.ClusterActorRefProvider;
import akka.actor.Address;
import akka.actor.Props;
import akka.cluster.ClusterActorRefProvider;
-import com.google.common.annotations.VisibleForTesting;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
@@
-230,7
+229,7
@@
public class BucketStore<T extends Copier<T>> extends AbstractUntypedActorWithMe
}
}
}
}
- p
rotected
BucketImpl<T> getLocalBucket() {
+ p
ublic
BucketImpl<T> getLocalBucket() {
return localBucket;
}
return localBucket;
}
@@
-239,12
+238,11
@@
public class BucketStore<T extends Copier<T>> extends AbstractUntypedActorWithMe
versions.put(selfAddress, localBucket.getVersion());
}
versions.put(selfAddress, localBucket.getVersion());
}
- p
rotected
Map<Address, Bucket<T>> getRemoteBuckets() {
+ p
ublic
Map<Address, Bucket<T>> getRemoteBuckets() {
return remoteBuckets;
}
return remoteBuckets;
}
- @VisibleForTesting
- Map<Address, Long> getVersions() {
+ public Map<Address, Long> getVersions() {
return versions;
}
}
return versions;
}
}