| commit | b4f4fdbceeb860aba69f4f761f9934db2b8faf0f | [log] [tgz] |
|---|---|---|
| author | Charles Chan <rascov@gmail.com> | Fri Dec 21 13:55:29 2018 -0800 |
| committer | Charles Chan <rascov@gmail.com> | Fri Dec 21 18:01:34 2018 -0800 |
| tree | 06d20c55aab85b6b1c4d816d655e035c85ac03e9 | |
| parent | 15cd86f9a7ba8f0136bed6ac8983ab2cf59b9be5 [diff] [blame] |
Unit test fix - timeout is not correctly set in parallel execution environment Change-Id: Id3089c45ad217113f9c01c93e2047114b7fbccb4
diff --git a/core/net/src/main/java/org/onosproject/net/flowobjective/impl/InOrderFlowObjectiveManager.java b/core/net/src/main/java/org/onosproject/net/flowobjective/impl/InOrderFlowObjectiveManager.java index 457c6e6..f625e9c 100644 --- a/core/net/src/main/java/org/onosproject/net/flowobjective/impl/InOrderFlowObjectiveManager.java +++ b/core/net/src/main/java/org/onosproject/net/flowobjective/impl/InOrderFlowObjectiveManager.java
@@ -63,7 +63,8 @@ private final Logger log = LoggerFactory.getLogger(getClass()); // TODO Make queue timeout configurable - static int objTimeoutMs = 15000; + static final int DEFAULT_OBJ_TIMEOUT = 15000; + int objTimeoutMs = DEFAULT_OBJ_TIMEOUT; private Cache<FilteringObjQueueKey, Objective> filtObjQueueHead; private Cache<ForwardingObjQueueKey, Objective> fwdObjQueueHead;