minor: idmanager UpdateIdEntryJob else block, for clarity when reading 76/48676/2
authorMichael Vorburger <vorburger@redhat.com>
Thu, 24 Nov 2016 18:01:26 +0000 (19:01 +0100)
committerMichael Vorburger <vorburger@redhat.com>
Thu, 24 Nov 2016 20:13:56 +0000 (21:13 +0100)
Change-Id: I1d093bfd157134a9b9b68dc1922d2a62b0ac57cf
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
idmanager/idmanager-impl/src/main/java/org/opendaylight/genius/idmanager/jobs/UpdateIdEntryJob.java

index 1d3599cdbb25d1ccaf74bddbc0d5406e4a40107f..2f860e48185cb2746d836b20aacc572f490f5398 100644 (file)
@@ -8,13 +8,14 @@
 
 package org.opendaylight.genius.idmanager.jobs;
 
+import static org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType.CONFIGURATION;
+
 import com.google.common.util.concurrent.ListenableFuture;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Callable;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.idmanager.IdUtils;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.id.pools.id.pool.IdEntries;
 
@@ -43,12 +44,10 @@ public class UpdateIdEntryJob implements Callable<List<ListenableFuture<Void>>>
         IdUtils.updateChildPool(tx, parentPoolName, localPoolName);
         if (newIdValues != null && !newIdValues.isEmpty()) {
             IdEntries newIdEntry = IdUtils.createIdEntries(idKey, newIdValues);
-            tx.merge(LogicalDatastoreType.CONFIGURATION, IdUtils.getIdEntriesInstanceIdentifier(parentPoolName, idKey),
-                    newIdEntry);
-            futures.add(tx.submit());
-            return futures;
+            tx.merge(CONFIGURATION, IdUtils.getIdEntriesInstanceIdentifier(parentPoolName, idKey), newIdEntry);
+        } else {
+            tx.delete(CONFIGURATION, IdUtils.getIdEntriesInstanceIdentifier(parentPoolName, idKey));
         }
-        tx.delete(LogicalDatastoreType.CONFIGURATION, IdUtils.getIdEntriesInstanceIdentifier(parentPoolName, idKey));
         futures.add(tx.submit());
         return futures;
     }