commit e265d370fb0587db84c4d793c32fb349033d66ba
author Jordan Halterman <jordan@onlab.us> Wed May 17 22:40:47 2017 -0700
committer Ray Milkey <ray@onlab.us> Thu May 18 20:09:24 2017 +0000
tree 7aea316f0270ba2cad59712dc204b7c895208a2c
parent a578d76b0fbf84bdc77f7699c074c16e24e05441

[ONOS-6380] Intent performance regression fix
- Do not wrap completed futures

Change-Id: I94729b6ba0fa22bf14d1910ff05d88395b61c82c

utils/misc/src/main/java/org/onlab/util/Tools.java

diff --git a/utils/misc/src/main/java/org/onlab/util/Tools.java b/utils/misc/src/main/java/org/onlab/util/Tools.java
index 0c76a91..d2aa1f5 100644
--- a/utils/misc/src/main/java/org/onlab/util/Tools.java
+++ b/utils/misc/src/main/java/org/onlab/util/Tools.java
@@ -662,6 +662,10 @@
             CompletableFuture<T> future,
             Executor orderedExecutor,
             Executor threadPoolExecutor) {
+        if (future.isDone()) {
+            return future;
+        }
+
         BlockingAwareFuture<T> newFuture = new BlockingAwareFuture<T>();
         future.whenComplete((result, error) -> {
             Runnable completer = () -> {