Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix incorrect trace log in FRM
[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 a51409fc2d241b61f2180b20841a942cf5e2ca36..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;
}
@@
-87,7
+93,8
@@
final class FlowEntryDistributionOrderFutureTask implements Future<Status> {
// Return the known status
return retStatus;
} else {
// Return the known status
return retStatus;
} else {
- logger.error("Timing out, the workStatus for order {} has not come back in time!", this.order);
+ logger.error("Timing out, the workStatus for order {} has not come back in time!, it's hashcode is {}",
+ this.order, this.order.hashCode());
return new Status(StatusCode.TIMEOUT);
}
}
return new Status(StatusCode.TIMEOUT);
}
}