commit 9ea3453b45227679184aef8e499cd8ec0756c754
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Wed Jan 28 12:28:00 2015 -0800
committer Jonathan Hart <jono@onlab.us> Wed Jan 28 22:17:00 2015 +0000
tree 2415be81db0c06674bafbb36771d14e0ea085a31
parent cb9c0ba6c5d96a003dccfbd99751bb63c92b42ef

Avoid empty check of BatchWrite in the caller side

Change-Id: I5672b2d6fab719ab9a5c642a942bf4a6191e808d

core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java

diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
index 8abddf2..69f6e45 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
@@ -1151,7 +1151,7 @@
 
                 // 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 @@
         }
 
         protected void writeBatch(BatchWrite batchWrite) {
-            if (!batchWrite.isEmpty()) {
-                store.batchWrite(batchWrite);
-            }
+            store.batchWrite(batchWrite);
         }
     }
 
@@ -1242,7 +1240,7 @@
                 // there are no flow rule batches; finalize the intent update
                 BatchWrite batchWrite = createFinalizedBatchWrite(updates);
 
-                writeBatch(batchWrite);
+                store.batchWrite(batchWrite);
                 return null;
             }
         }