Remove unneeded check 40/73840/3
authorRobert Varga <robert.varga@pantheon.tech>
Mon, 9 Jul 2018 10:53:50 +0000 (12:53 +0200)
committerRobert Varga <robert.varga@pantheon.tech>
Tue, 10 Jul 2018 16:02:24 +0000 (18:02 +0200)
The size of the collection is checked before we allocate
the transaction, hence conditional commit does not make sense.

Change-Id: Iada5db72f2fcf51528c8b1791f2b5ae9d7f51c6a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
netconf/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/IetfZeroTouchCallHomeServerProvider.java

index b71e423c4a9d97b6ca85c8d5626a0f3189b1412e..2d752489a14f83b34f0355acd430bd1ddb46badd 100644 (file)
@@ -177,16 +177,12 @@ public class IetfZeroTouchCallHomeServerProvider implements AutoCloseable, DataT
 
         ReadWriteTransaction opTx = dataBroker.newReadWriteTransaction();
 
-        int numRemoved = deletedDevices.size();
-
         for (InstanceIdentifier<?> removedIID : deletedDevices) {
             LOG.info("Deleting the entry for callhome device {}", removedIID);
             opTx.delete(LogicalDatastoreType.OPERATIONAL, removedIID);
         }
 
-        if (numRemoved > 0) {
-            opTx.commit();
-        }
+        opTx.commit();
     }
 
     private static List<Device> getReadDevices(final ListenableFuture<Optional<AllowedDevices>> devicesFuture)