Fix NPE if flowSpecCapability is not specified

Change-Id: Iac5958cdbcd495f3b661771628de429eb2a07556

Fix NPE if flowSpecCapability is not specified
Change-Id: Iac5958cdbcd495f3b661771628de429eb2a07556
Ray Milkey · Gerrit Code Review
Commit 3188c9b733ee8d17989456770b09df45c5673784 3188c9b7 1 parent 813a20df
Showing 1 changed file with 22 additions and 14 deletions
providers/bgp/cfg/src/main/java/org/onosproject/provider/bgp/cfg/impl/BgpCfgProvider.java
--- a/providers/bgp/cfg/src/main/java/org/onosproject/provider/bgp/cfg/impl/BgpCfgProvider.java
View file @3188c9b
+++ b/providers/bgp/cfg/src/main/java/org/onosproject/provider/bgp/cfg/impl/BgpCfgProvider.java
View file @3188c9b
@@ -128,14 +128,18 @@ public class BgpCfgProvider extends AbstractProvider {
         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 @@ public class BgpCfgProvider extends AbstractProvider {
         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());