commit 3188c9b733ee8d17989456770b09df45c5673784
author Ray Milkey <ray@onlab.us> Mon Sep 12 11:51:07 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Thu Sep 15 03:28:32 2016 +0000
tree 507a883e0502486f8454a118d6d5e1684ed23fbb
parent 813a20df069d5e7bde0f390be768412785233a23

Fix NPE if flowSpecCapability is not specified

Change-Id: Iac5958cdbcd495f3b661771628de429eb2a07556

providers/bgp/cfg/src/main/java/org/onosproject/provider/bgp/cfg/impl/BgpCfgProvider.java

diff --git a/providers/bgp/cfg/src/main/java/org/onosproject/provider/bgp/cfg/impl/BgpCfgProvider.java b/providers/bgp/cfg/src/main/java/org/onosproject/provider/bgp/cfg/impl/BgpCfgProvider.java
index 359852d..65c6208 100644
--- a/providers/bgp/cfg/src/main/java/org/onosproject/provider/bgp/cfg/impl/BgpCfgProvider.java
+++ b/providers/bgp/cfg/src/main/java/org/onosproject/provider/bgp/cfg/impl/BgpCfgProvider.java
@@ -128,14 +128,18 @@
         bgpConfig.setMaxSession(config.maxSession());
         bgpConfig.setLargeASCapability(config.largeAsCapability());
 
-        if (config.flowSpecCapability().equals("IPV4")) {
-            bgpConfig.setFlowSpecCapability(BgpCfg.FlowSpec.IPV4);
-        } else if (config.flowSpecCapability().equals("VPNV4")) {
-            bgpConfig.setFlowSpecCapability(BgpCfg.FlowSpec.VPNV4);
-        } else if (config.flowSpecCapability().equals("IPV4_VPNV4")) {
-            bgpConfig.setFlowSpecCapability(BgpCfg.FlowSpec.IPV4_VPNV4);
-        } else {
+        if (config.flowSpecCapability() == null) {
             bgpConfig.setFlowSpecCapability(BgpCfg.FlowSpec.NONE);
+        } else {
+            if (config.flowSpecCapability().equals("IPV4")) {
+                bgpConfig.setFlowSpecCapability(BgpCfg.FlowSpec.IPV4);
+            } else if (config.flowSpecCapability().equals("VPNV4")) {
+                bgpConfig.setFlowSpecCapability(BgpCfg.FlowSpec.VPNV4);
+            } else if (config.flowSpecCapability().equals("IPV4_VPNV4")) {
+                bgpConfig.setFlowSpecCapability(BgpCfg.FlowSpec.IPV4_VPNV4);
+            } else {
+                bgpConfig.setFlowSpecCapability(BgpCfg.FlowSpec.NONE);
+            }
         }
         bgpConfig.setFlowSpecRpdCapability(config.rpdCapability());
 
@@ -178,14 +182,18 @@
         bgpConfig.setMaxSession(config.maxSession());
         bgpConfig.setLargeASCapability(config.largeAsCapability());
 
-        if (config.flowSpecCapability().equals("IPV4")) {
-            bgpConfig.setFlowSpecCapability(BgpCfg.FlowSpec.IPV4);
-        } else if (config.flowSpecCapability().equals("VPNV4")) {
-            bgpConfig.setFlowSpecCapability(BgpCfg.FlowSpec.VPNV4);
-        } else if (config.flowSpecCapability().equals("IPV4_VPNV4")) {
-            bgpConfig.setFlowSpecCapability(BgpCfg.FlowSpec.IPV4_VPNV4);
-        } else {
+        if (config.flowSpecCapability() == null) {
             bgpConfig.setFlowSpecCapability(BgpCfg.FlowSpec.NONE);
+        } else {
+            if (config.flowSpecCapability().equals("IPV4")) {
+                bgpConfig.setFlowSpecCapability(BgpCfg.FlowSpec.IPV4);
+            } else if (config.flowSpecCapability().equals("VPNV4")) {
+                bgpConfig.setFlowSpecCapability(BgpCfg.FlowSpec.VPNV4);
+            } else if (config.flowSpecCapability().equals("IPV4_VPNV4")) {
+                bgpConfig.setFlowSpecCapability(BgpCfg.FlowSpec.IPV4_VPNV4);
+            } else {
+                bgpConfig.setFlowSpecCapability(BgpCfg.FlowSpec.NONE);
+            }
         }
         bgpConfig.setFlowSpecRpdCapability(config.rpdCapability());