commit 70ce68ebe676a200a17ea6a7800e427316c7a952
author Charles Chan <rascov@gmail.com> Thu May 10 11:32:56 2018 -0700
committer Charles Chan <charles@opennetworking.org> Thu May 10 18:37:58 2018 +0000
tree 42bec758555d03ef173fe1ff258e11629ac7f959
parent 1487decc73031e5994c28141161e00e7c9113ce0

Fixing NPE in processVlanIdFilter

Change-Id: I22fcf94208ede4d1a2c47f15fd7402fdae06afdf

drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/CpqdOfdpa2Pipeline.java

diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/CpqdOfdpa2Pipeline.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/CpqdOfdpa2Pipeline.java
index 9876a0c..2e71427 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/CpqdOfdpa2Pipeline.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/CpqdOfdpa2Pipeline.java
@@ -184,7 +184,7 @@
         // ofdpa cannot match on ALL portnumber, so we need to use separate
         // rules for each port.
         List<PortNumber> portnums = new ArrayList<>();
-        if (portCriterion.port() == PortNumber.ALL) {
+        if (portCriterion != null && portCriterion.port() == PortNumber.ALL) {
             for (Port port : deviceService.getPorts(deviceId)) {
                 if (port.number().toLong() > 0 && port.number().toLong() < OFPP_MAX) {
                     portnums.add(port.number());