commit ad4f2cd9da73c1a2916d7519eb8b762d2bb39a9b
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Thu Sep 01 13:05:56 2016 -0700
committer Thomas Vachuska <tom@onlab.us> Thu Sep 01 22:11:51 2016 +0000
tree 45a7131e0c7dcd0d0a2419777da89da0b515013a
parent c9e4bb004862d5821008e29757828244791b72b8

Apply Null Object pattern

Change-Id: I9b4d30114b22dcd32b228e4f17bb541beed4ebed

core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java

diff --git a/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java b/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
index 40829be..82c1c43 100644
--- a/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
+++ b/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
@@ -614,7 +614,7 @@
         public synchronized void run() {
             if (stages.size() > 0) {
                 process(stages.remove(0));
-            } else if (!hasFailed && fops.callback() != null) {
+            } else if (!hasFailed) {
                 fops.callback().onSuccess(fops);
             }
         }
@@ -651,13 +651,10 @@
                 operationsService.execute(this);
             }
 
-            if (fops.callback() != null) {
-                final FlowRuleOperations.Builder failedOpsBuilder =
-                    FlowRuleOperations.builder();
-                failures.forEach(failedOpsBuilder::add);
+            FlowRuleOperations.Builder failedOpsBuilder = FlowRuleOperations.builder();
+            failures.forEach(failedOpsBuilder::add);
 
-                fops.callback().onError(failedOpsBuilder.build());
-            }
+            fops.callback().onError(failedOpsBuilder.build());
         }
     }