Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Simplify method isMutualExclusive in Subnet. Remove redundant 'if' statements."
[controller.git]
/
opendaylight
/
forwardingrulesmanager
/
implementation
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
forwardingrulesmanager
/
internal
/
FlowEntryDistributionOrderFutureTask.java
diff --git
a/opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/FlowEntryDistributionOrderFutureTask.java
b/opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/FlowEntryDistributionOrderFutureTask.java
index 0c105bae1e8f462a6a32af6fd826152d860ade9f..b8c2d1db55067b9fc880ccfa74d352a0a45965a0 100644
(file)
--- a/
opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/FlowEntryDistributionOrderFutureTask.java
+++ b/
opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/FlowEntryDistributionOrderFutureTask.java
@@
-65,6
+65,12
@@
final class FlowEntryDistributionOrderFutureTask implements Future<Status> {
@Override
public boolean cancel(boolean mayInterruptIfRunning) {
@Override
public boolean cancel(boolean mayInterruptIfRunning) {
+ if (this.waitingLatch.getCount() != 0L) {
+ this.retStatus = new Status(StatusCode.GONE);
+ this.waitingLatch.countDown();
+ logger.trace("Cancelled the workOrder");
+ return true;
+ }
return false;
}
return false;
}