commit | 9f111e6e6ec5bca7d1376ebb5f34184ae9690cca | [log] [tgz] |
---|---|---|
author | Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> | Tue Mar 07 17:26:33 2017 -0800 |
committer | Yuta HIGUCHI <y-higuchi@onlab.us> | Mon Mar 13 18:51:14 2017 +0000 |
tree | 18e7215cdf5f464e4cd1dd76693ead0a905c89a7 | |
parent | 5168f61dc75dd6cefb45e31c9032ac5d4ca4c113 [diff] |
ONOS-6081 Do not throw Exception when queried for unknown resource. Change-Id: I3b5c7306350c8f175e809e41611b5cabb844fe92
diff --git a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentContinuousResourceSubStore.java b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentContinuousResourceSubStore.java index 60eed40..887b35b 100644 --- a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentContinuousResourceSubStore.java +++ b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentContinuousResourceSubStore.java
@@ -94,11 +94,12 @@ return false; } - ContinuousResource registered = children.value().stream() + boolean notEnoughRegistered = children.value().stream() .filter(c -> c.id().equals(resource.id())) .findFirst() - .get(); - if (registered.value() < resource.value()) { + .map(registered -> registered.value() < resource.value()) + .orElse(true); + if (notEnoughRegistered) { // Capacity < requested, can never satisfy return false; }