| commit | e2eac102fc3f47c06c0cc1230dde59f6e4255328 | [log] [tgz] |
|---|---|---|
| author | Brian O'Connor <bocon@onlab.us> | Thu Feb 12 18:30:22 2015 -0800 |
| committer | Brian O'Connor <bocon@onlab.us> | Fri Feb 13 14:16:23 2015 -0800 |
| tree | 500dd3b72a6272de657524e622669d13de6a43be | |
| parent | 9288836389c06ecc92aeacd37e55724f7c5d7a7d [diff] [blame] |
Using replace instead install when there is already an intent Fixes the problem of flows being left on the data plane Change-Id: Iec3db8b460123f2744a57d8c08d14c8effe9ec34
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/WithdrawCoordinating.java b/core/net/src/main/java/org/onosproject/net/intent/impl/WithdrawCoordinating.java index bd94ed6..aa5e993 100644 --- a/core/net/src/main/java/org/onosproject/net/intent/impl/WithdrawCoordinating.java +++ b/core/net/src/main/java/org/onosproject/net/intent/impl/WithdrawCoordinating.java
@@ -47,6 +47,7 @@ @Override public Optional<IntentUpdate> execute() { try { + // Note: current.installables() are not null or empty due to createIntentUpdate check FlowRuleOperations flowRules = intentManager.uninstallCoordinate(current, pending); pending.setInstallables(current.installables()); return Optional.of(new Withdrawing(intentManager, pending, flowRules));