mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-16 18:02:05 +02:00
Code Issues Projects Releases Wiki Activity

Fix error prone reported probem with map key type

Browse Source 
Change-Id: Iaeb1aa3b5d23dfb7a4d7755787514c1571aa192f
(cherry picked from commit 186d9fb43bfa079c3454966372e81897541f95cf)
This commit is contained in:
Ray Milkey 2018-06-21 14:56:47 -07:00
parent c5e2f43a8a
commit 30f35b2aff
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/SimpleVirtualMastershipStore.java
View File

@ -196,10 +196,11 @@ public class SimpleVirtualMastershipStore
if (master != null) { if (master != null) {
roleBuilder.put(master, MastershipRole.MASTER); roleBuilder.put(master, MastershipRole.MASTER);
} }
backups.getOrDefault(master, Collections.emptyList()) backups.getOrDefault(deviceId, Collections.emptyList())
.forEach(nodeId -> roleBuilder.put(nodeId, MastershipRole.STANDBY)); .forEach(nodeId -> roleBuilder.put(nodeId, MastershipRole.STANDBY));
clusterService.getNodes().stream() clusterService.getNodes().stream()
.filter(node -> !masterMap.containsValue(node.id())) .filter(node -> !masterMap.containsValue(node.id()))
.filter(node -> !backups.get(deviceId).contains(node.id()))
.forEach(node -> roleBuilder.put(node.id(), MastershipRole.NONE)); .forEach(node -> roleBuilder.put(node.id(), MastershipRole.NONE));
return new MastershipInfo( return new MastershipInfo(
termMap.getOrDefault(deviceId, new AtomicInteger(NOTHING)).get(), termMap.getOrDefault(deviceId, new AtomicInteger(NOTHING)).get(),