commit 3bb117017c7cb6a41b7b9632445044700a56ba36
author Charles Chan <rascov@gmail.com> Thu Feb 16 14:58:58 2017 -0800
committer Jonathan Hart <jono@onlab.us> Tue Feb 21 17:53:58 2017 +0000
tree 4f7a7f931742799b2c489e82bd757a55211b56dc
parent 3c1691ac234c8bd53946aa3c890b6a81c7f80e0f

Fix NPE when treatment is not present in versatile fwd obj

Change-Id: Iea6e97ae02457555817fe51d97d2126be2ef321a

drivers/default/src/main/java/org/onosproject/driver/pipeline/Ofdpa3Pipeline.java

diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/Ofdpa3Pipeline.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/Ofdpa3Pipeline.java
index 78e8df4..1cce714 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/Ofdpa3Pipeline.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/Ofdpa3Pipeline.java
@@ -468,6 +468,10 @@
      * otherwise null
      */
     private ModTunnelIdInstruction getModTunnelIdInstruction(TrafficTreatment treatment) {
+        if (treatment == null) {
+            return null;
+        }
+
         L2ModificationInstruction l2ModificationInstruction;
         for (Instruction instruction : treatment.allInstructions()) {
             if (instruction.type() == L2MODIFICATION) {