홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
tom
7951b23a 1 parent a0ed763c

Fixed NPE when removing flows.

Inline Side-by-side
Showing 1 changed file with 3 additions and 1 deletions
...@@ -103,11 +103,13 @@ public class FlowRuleManager ...@@ -103,11 +103,13 @@ public class FlowRuleManager
103 for (int i = 0; i < flowRules.length; i++) { 103 for (int i = 0; i < flowRules.length; i++) {
104 f = flowRules[i]; 104 f = flowRules[i];
105 device = deviceService.getDevice(f.deviceId()); 105 device = deviceService.getDevice(f.deviceId());
106 - frp = getProvider(device.providerId());
107 store.deleteFlowRule(f); 106 store.deleteFlowRule(f);
107 + if (device != null) {
108 + frp = getProvider(device.providerId());
108 frp.removeFlowRule(f); 109 frp.removeFlowRule(f);
109 } 110 }
110 } 111 }
112 + }
111 113
112 @Override 114 @Override
113 public void removeFlowRulesById(ApplicationId id) { 115 public void removeFlowRulesById(ApplicationId id) {
......