Replacing nonNull API's in netvirt.

[netvirt.git] / vpnmanager / impl / src / main / java / org / opendaylight / netvirt / vpnmanager / FibEntriesListener.java

diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/FibEntriesListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/FibEntriesListener.java
index 8f09d11ced8665bf8bdce4601ba8ebc3e1989575..42131ce1bc86cf6933c3ebc915c1944112e0d1e6 100644 (file)
--- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/FibEntriesListener.java
+++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/FibEntriesListener.java
@@ -69,7 +69,7 @@ public class FibEntriesListener extends AbstractAsyncDataTreeChangeListener<VrfE
         LOG.trace("Remove Fib event - Key : {}, value : {} ", identifier, del);
         final VrfTablesKey key = identifier.firstKeyOf(VrfTables.class);
         String rd = key.getRouteDistinguisher();
-        List<RoutePaths> routePaths = new ArrayList<RoutePaths>(del.getRoutePaths().values());
+        List<RoutePaths> routePaths = new ArrayList<RoutePaths>(del.nonnullRoutePaths().values());
         removeLabelFromVpnInstance(rd, routePaths);
     }
 
@@ -78,8 +78,8 @@ public class FibEntriesListener extends AbstractAsyncDataTreeChangeListener<VrfE
         VrfEntry original, VrfEntry update) {
         final VrfTablesKey key = identifier.firstKeyOf(VrfTables.class);
         String rd = key.getRouteDistinguisher();
-        List<RoutePaths> originalRoutePaths = new ArrayList<RoutePaths>(original.getRoutePaths().values());
-        List<RoutePaths> updateRoutePaths = new ArrayList<RoutePaths>(update.getRoutePaths().values());
+        List<RoutePaths> originalRoutePaths = new ArrayList<RoutePaths>(original.nonnullRoutePaths().values());
+        List<RoutePaths> updateRoutePaths = new ArrayList<RoutePaths>(update.nonnullRoutePaths().values());
         if (originalRoutePaths.size() < updateRoutePaths.size()) {
             updateRoutePaths.removeAll(originalRoutePaths);
             addLabelToVpnInstance(rd, updateRoutePaths);
@@ -95,7 +95,7 @@ public class FibEntriesListener extends AbstractAsyncDataTreeChangeListener<VrfE
         LOG.trace("Add Vrf Entry event - Key : {}, value : {}", identifier, add);
         final VrfTablesKey key = identifier.firstKeyOf(VrfTables.class);
         String rd = key.getRouteDistinguisher();
-        addLabelToVpnInstance(rd, new ArrayList<RoutePaths>(add.getRoutePaths().values()));
+        addLabelToVpnInstance(rd, new ArrayList<RoutePaths>(add.nonnullRoutePaths().values()));
     }
 
     private void addLabelToVpnInstance(String rd, List<RoutePaths> routePaths) {