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 "Fix bug in hello message: module with more revisions."
[controller.git]
/
opendaylight
/
networkconfiguration
/
neutron
/
implementation
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
networkconfig
/
neutron
/
implementation
/
NeutronFloatingIPInterface.java
diff --git
a/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronFloatingIPInterface.java
b/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronFloatingIPInterface.java
index ceb009bf2c142006f44c069eae06beb81526a317..b1b2610134cb2c7b97970e48e3fec477dab696f3 100644
(file)
--- a/
opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronFloatingIPInterface.java
+++ b/
opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronFloatingIPInterface.java
@@
-17,8
+17,8
@@
import java.util.Dictionary;
import java.util.EnumSet;
import java.util.HashSet;
import java.util.List;
import java.util.EnumSet;
import java.util.HashSet;
import java.util.List;
-import java.util.Set;
import java.util.Map.Entry;
import java.util.Map.Entry;
+import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@@
-117,7
+117,7
@@
public class NeutronFloatingIPInterface implements INeutronFloatingIPCRUD, IConf
private void startUp() {
allocateCache();
retrieveCache();
private void startUp() {
allocateCache();
retrieveCache();
- if (
floatingIPDB.isEmpty(
)) {
+ if (
(clusterContainerService != null) && (clusterContainerService.amICoordinator()
)) {
loadConfiguration();
}
}
loadConfiguration();
}
}