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 "Tests for loading data with augmented schema nodes with equal names"
[controller.git]
/
opendaylight
/
networkconfiguration
/
neutron
/
implementation
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
networkconfig
/
neutron
/
implementation
/
NeutronSubnetInterface.java
diff --git
a/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronSubnetInterface.java
b/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronSubnetInterface.java
index f908a95c313390e25b340f862d4f63e65999c07c..049fd3283da007c4bf3a7a1e49191fb5fb04de7f 100644
(file)
--- a/
opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronSubnetInterface.java
+++ b/
opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronSubnetInterface.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;
@@
-115,7
+115,7
@@
public class NeutronSubnetInterface implements INeutronSubnetCRUD, IConfiguratio
private void startUp() {
allocateCache();
retrieveCache();
private void startUp() {
allocateCache();
retrieveCache();
- if (
subnetDB.isEmpty(
)) {
+ if (
(clusterContainerService != null) && (clusterContainerService.amICoordinator()
)) {
loadConfiguration();
}
loadConfiguration();
}