Fix NPE in FlowEntryBuilder

Change-Id: I1675ff7d6604ce289532f6f6e8bf9ebc40935512

Fix NPE in FlowEntryBuilder
Change-Id: I1675ff7d6604ce289532f6f6e8bf9ebc40935512
Charles Chan · Gerrit Code Review
Commit 4211baa138550c3cd64e30896b92d0f74bb6f868 4211baa1 1 parent b2111341
Showing 1 changed file with 7 additions and 5 deletions
providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/util/FlowEntryBuilder.java
--- a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/util/FlowEntryBuilder.java
View file @4211baa
+++ b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/util/FlowEntryBuilder.java
View file @4211baa
@@ -441,11 +441,13 @@ public class FlowEntryBuilder {
             builder.setVlanPcp(vlanpcp.getValue().getValue());
             break;
         case VLAN_VID:
-            try {
+            if (treatmentInterpreter != null) {
-                builder.extension(treatmentInterpreter.mapAction(action), deviceId);
+                try {
-                break;
+                    builder.extension(treatmentInterpreter.mapAction(action), deviceId);
-            } catch (UnsupportedOperationException e) {
+                    break;
-                log.debug("Unsupported action extension; defaulting to native OF");
+                } catch (UnsupportedOperationException e) {
+                    log.debug("Unsupported action extension; defaulting to native OF");
+                }
             }
             @SuppressWarnings("unchecked")
             OFOxm<OFVlanVidMatch> vlanvid = (OFOxm<OFVlanVidMatch>) oxm;