Change hasEnoughResource() to instance method from static method
Change-Id: Ib6de1bfc2b7e65677c3685ac3c2f51391204d9cf
diff --git a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/TransactionalContinuousResourceSubStore.java b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/TransactionalContinuousResourceSubStore.java
index c595585..f70dd60 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/TransactionalContinuousResourceSubStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/TransactionalContinuousResourceSubStore.java
@@ -35,7 +35,6 @@
import static com.google.common.base.Preconditions.checkArgument;
import static org.onosproject.store.resource.impl.ConsistentResourceStore.SERIALIZER;
-import static org.onosproject.store.resource.impl.ContinuousResourceAllocation.hasEnoughResource;
class TransactionalContinuousResourceSubStore {
private final Logger log = LoggerFactory.getLogger(getClass());
@@ -140,7 +139,9 @@
// Down cast: this must be safe as ContinuousResource is associated with ContinuousResourceId
ContinuousResource original = lookedUp.get();
ContinuousResourceAllocation allocations = consumers.get(request.id());
- if (!hasEnoughResource(original, request, allocations)) {
+ if (!Optional.ofNullable(allocations)
+ .orElse(ContinuousResourceAllocation.empty(original))
+ .hasEnoughResource(original, request)) {
return false;
}