commit 1a3c0655ecd551c82423e44422533c25c911024a
author Patryk Konopka <p.konopka2@samsung.com> Wed Jan 18 16:16:02 2017 +0100
committer Charles Chan <charles@onlab.us> Thu Jan 19 18:08:28 2017 +0000
tree 710587a3b1a72e1e3af957bdd3bf58e55e1f9cb3
parent 2f39b54fd59bb1bb711af277f7cd408206a3b6d5

[ONOS-5838] Missing null reference check bugfix

Change-Id: I843ad3a8777a80d9e86a4c1fe227c002a6772e1b

apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java

diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
index 47f6cbd..9e215a9 100644
--- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
@@ -559,7 +559,7 @@
         }
 
         List<Port> devPorts = srManager.deviceService.getPorts(deviceId);
-        if (devPorts != null && devPorts.size() == 0) {
+        if (devPorts == null || devPorts.size() == 0) {
             log.warn("Device {} ports not available. Unable to add MacVlan filters",
                      deviceId);
             return null;