홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Ray Milkey
Committed by Gerrit Code Review
3188c9b7 1 parent 813a20df

Fix NPE if flowSpecCapability is not specified 

Change-Id: Iac5958cdbcd495f3b661771628de429eb2a07556
Inline Side-by-side
Showing 1 changed file with 8 additions and 0 deletions
...@@ -128,6 +128,9 @@ public class BgpCfgProvider extends AbstractProvider { ...@@ -128,6 +128,9 @@ public class BgpCfgProvider extends AbstractProvider {
128 bgpConfig.setMaxSession(config.maxSession()); 128 bgpConfig.setMaxSession(config.maxSession());
129 bgpConfig.setLargeASCapability(config.largeAsCapability()); 129 bgpConfig.setLargeASCapability(config.largeAsCapability());
130 130
131 + if (config.flowSpecCapability() == null) {
132 + bgpConfig.setFlowSpecCapability(BgpCfg.FlowSpec.NONE);
133 + } else {
131 if (config.flowSpecCapability().equals("IPV4")) { 134 if (config.flowSpecCapability().equals("IPV4")) {
132 bgpConfig.setFlowSpecCapability(BgpCfg.FlowSpec.IPV4); 135 bgpConfig.setFlowSpecCapability(BgpCfg.FlowSpec.IPV4);
133 } else if (config.flowSpecCapability().equals("VPNV4")) { 136 } else if (config.flowSpecCapability().equals("VPNV4")) {
...@@ -137,6 +140,7 @@ public class BgpCfgProvider extends AbstractProvider { ...@@ -137,6 +140,7 @@ public class BgpCfgProvider extends AbstractProvider {
137 } else { 140 } else {
138 bgpConfig.setFlowSpecCapability(BgpCfg.FlowSpec.NONE); 141 bgpConfig.setFlowSpecCapability(BgpCfg.FlowSpec.NONE);
139 } 142 }
143 + }
140 bgpConfig.setFlowSpecRpdCapability(config.rpdCapability()); 144 bgpConfig.setFlowSpecRpdCapability(config.rpdCapability());
141 145
142 nodes = config.bgpPeer(); 146 nodes = config.bgpPeer();
...@@ -178,6 +182,9 @@ public class BgpCfgProvider extends AbstractProvider { ...@@ -178,6 +182,9 @@ public class BgpCfgProvider extends AbstractProvider {
178 bgpConfig.setMaxSession(config.maxSession()); 182 bgpConfig.setMaxSession(config.maxSession());
179 bgpConfig.setLargeASCapability(config.largeAsCapability()); 183 bgpConfig.setLargeASCapability(config.largeAsCapability());
180 184
185 + if (config.flowSpecCapability() == null) {
186 + bgpConfig.setFlowSpecCapability(BgpCfg.FlowSpec.NONE);
187 + } else {
181 if (config.flowSpecCapability().equals("IPV4")) { 188 if (config.flowSpecCapability().equals("IPV4")) {
182 bgpConfig.setFlowSpecCapability(BgpCfg.FlowSpec.IPV4); 189 bgpConfig.setFlowSpecCapability(BgpCfg.FlowSpec.IPV4);
183 } else if (config.flowSpecCapability().equals("VPNV4")) { 190 } else if (config.flowSpecCapability().equals("VPNV4")) {
...@@ -187,6 +194,7 @@ public class BgpCfgProvider extends AbstractProvider { ...@@ -187,6 +194,7 @@ public class BgpCfgProvider extends AbstractProvider {
187 } else { 194 } else {
188 bgpConfig.setFlowSpecCapability(BgpCfg.FlowSpec.NONE); 195 bgpConfig.setFlowSpecCapability(BgpCfg.FlowSpec.NONE);
189 } 196 }
197 + }
190 bgpConfig.setFlowSpecRpdCapability(config.rpdCapability()); 198 bgpConfig.setFlowSpecRpdCapability(config.rpdCapability());
191 199
192 /* update the peer configuration */ 200 /* update the peer configuration */
......