commit 1bf46b1b372d36138b025a3f90daad0d02ab4a17
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Fri May 06 15:42:29 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Tue May 10 20:48:06 2016 +0000
tree 0752e1e55a946e4be1612be5c1d29211715f5104
parent 6130ffc1a1bde0e03a6e8d1405cac2750a3477c7

Refactor: Simplify register() and unregister() in transactional stores

Change-Id: Ie39391774d54c209ec2b8ce61adc76d5ba4efa7e

core/store/dist/src/main/java/org/onosproject/store/resource/impl/TransactionalDiscreteResourceStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/TransactionalDiscreteResourceStore.java b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/TransactionalDiscreteResourceStore.java
index 72841fb..3c99da9 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/TransactionalDiscreteResourceStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/TransactionalDiscreteResourceStore.java
@@ -63,6 +63,11 @@
     }
 
     boolean register(DiscreteResourceId key, List<DiscreteResource> values) {
+        // short-circuit: receiving empty resource is regarded as success
+        if (values.isEmpty()) {
+            return true;
+        }
+
         Set<DiscreteResource> requested = new LinkedHashSet<>(values);
         Set<DiscreteResource> oldValues = childMap.putIfAbsent(key, requested);
         if (oldValues == null) {
@@ -82,6 +87,11 @@
     }
 
     boolean unregister(DiscreteResourceId key, List<DiscreteResource> values) {
+        // short-circuit: receiving empty resource is regarded as success
+        if (values.isEmpty()) {
+            return true;
+        }
+
         Set<DiscreteResource> oldValues = childMap.putIfAbsent(key, new LinkedHashSet<>());
         if (oldValues == null) {
             log.trace("No-Op removing values. key {} did not exist", key);