Avoid empty check of BatchWrite in the caller side

Change-Id: I5672b2d6fab719ab9a5c642a942bf4a6191e808d

Avoid empty check of BatchWrite in the caller side
Change-Id: I5672b2d6fab719ab9a5c642a942bf4a6191e808d
Sho SHIMIZU · Jonathan Hart
Commit 9ea3453b45227679184aef8e499cd8ec0756c754 9ea3453b 1 parent cb9c0ba6
Showing 1 changed file with 3 additions and 5 deletions
core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
View file @9ea3453
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
View file @9ea3453
@@ -1151,7 +1151,7 @@ public class IntentManager
 
                 // Write batch information
                 BatchWrite batchWrite = createBatchWrite(updates);
-                 writeBatch(batchWrite);
+                 store.batchWrite(batchWrite);
 
                 new IntentBatchApplyFirst(ops, processIntentUpdates(updates), endTime, 0, null).run();
             } catch (Exception e) {
@@ -1200,9 +1200,7 @@ public class IntentManager
         }
 
         protected void writeBatch(BatchWrite batchWrite) {
-             if (!batchWrite.isEmpty()) {
-                 store.batchWrite(batchWrite);
-             }
+             store.batchWrite(batchWrite);
         }
     }
 
@@ -1242,7 +1240,7 @@ public class IntentManager
                 // there are no flow rule batches; finalize the intent update
                 BatchWrite batchWrite = createFinalizedBatchWrite(updates);
 
-                 writeBatch(batchWrite);
+                 store.batchWrite(batchWrite);
                 return null;
             }
         }