Refactor: Move allocation check into transactional store implementation

Change-Id: Id2381d6789f12c8a0c0730b17e3395d144265f14

@@ -173,23 +173,7 @@ public class ConsistentResourceStore extends AbstractStore<ResourceEvent, Resour
         Map<DiscreteResourceId, List<Resource>> resourceMap = resources.stream()
         Map<DiscreteResourceId, List<Resource>> resourceMap = resources.stream()
                 .collect(Collectors.groupingBy(x -> x.parent().get().id(), LinkedHashMap::new, Collectors.toList()));
                 .collect(Collectors.groupingBy(x -> x.parent().get().id(), LinkedHashMap::new, Collectors.toList()));
 
 
-        // even if one of the resources is allocated to a consumer,
-        // all unregistrations are regarded as failure
         for (Map.Entry<DiscreteResourceId, List<Resource>> entry : resourceMap.entrySet()) {
         for (Map.Entry<DiscreteResourceId, List<Resource>> entry : resourceMap.entrySet()) {
-            boolean allocated = entry.getValue().stream().anyMatch(x -> {
-                if (x instanceof DiscreteResource) {
-                    return discreteTxStore.isAllocated(((DiscreteResource) x).id());
-                } else if (x instanceof ContinuousResource) {
-                    return continuousTxStore.isAllocated(((ContinuousResource) x).id());
-                } else {
-                    return false;
-                }
-            });
-            if (allocated) {
-                log.warn("Failed to unregister {}: allocation exists", entry.getKey());
-                return abortTransaction(tx);
-            }
-
             if (!unregister(discreteTxStore, continuousTxStore, entry.getKey(), entry.getValue())) {
             if (!unregister(discreteTxStore, continuousTxStore, entry.getKey(), entry.getValue())) {
                 log.warn("Failed to unregister {}: Failed to remove {} values.",
                 log.warn("Failed to unregister {}: Failed to remove {} values.",
                         entry.getKey(), entry.getValue().size());
                         entry.getKey(), entry.getValue().size());

@@ -102,6 +102,14 @@ class TransactionalContinuousResourceStore {
             return true;
             return true;
         }
         }
 
 
+        // even if one of the resources is allocated to a consumer,
+        // all unregistrations are regarded as failure
+        boolean allocated = values.stream().anyMatch(x -> isAllocated(x.id()));
+        if (allocated) {
+            log.warn("Failed to unregister {}: allocation exists", key);
+            return false;
+        }
+
         Set<ContinuousResource> oldValues = childMap.putIfAbsent(key, new LinkedHashSet<>());
         Set<ContinuousResource> oldValues = childMap.putIfAbsent(key, new LinkedHashSet<>());
         if (oldValues == null) {
         if (oldValues == null) {
             log.trace("No-Op removing values. key {} did not exist", key);
             log.trace("No-Op removing values. key {} did not exist", key);

@@ -92,6 +92,14 @@ class TransactionalDiscreteResourceStore {
             return true;
             return true;
         }
         }
 
 
+        // even if one of the resources is allocated to a consumer,
+        // all unregistrations are regarded as failure
+        boolean allocated = values.stream().anyMatch(x -> isAllocated(x.id()));
+        if (allocated) {
+            log.warn("Failed to unregister {}: allocation exists", key);
+            return false;
+        }
+
         Set<DiscreteResource> oldValues = childMap.putIfAbsent(key, new LinkedHashSet<>());
         Set<DiscreteResource> oldValues = childMap.putIfAbsent(key, new LinkedHashSet<>());
         if (oldValues == null) {
         if (oldValues == null) {
             log.trace("No-Op removing values. key {} did not exist", key);
             log.trace("No-Op removing values. key {} did not exist", key);