commit ca0bc8b10e172ea793b985bd9096eecc75682d5d
author Satish K <satishk@huawei.com> Sat Nov 28 16:06:54 2015 +0530
committer Ray Milkey <ray@onlab.us> Mon Nov 30 19:09:26 2015 +0000
tree 4d37fa4995819a46b8ff4ec2ff6c865fdf7fb246
parent d35f89c1aae122df256562658fe60fe682c04005

Duplicate Null Check not required

Change-Id: I31e3702b1456b8c5b50bf8e139833bd5f818df6d

apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/subnet/impl/SubnetManager.java

diff --git a/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/subnet/impl/SubnetManager.java b/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/subnet/impl/SubnetManager.java
index 890beb2..9443038 100644
--- a/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/subnet/impl/SubnetManager.java
+++ b/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/subnet/impl/SubnetManager.java
@@ -144,21 +144,19 @@
     @Override
     public boolean updateSubnets(Iterable<Subnet> subnets) {
         checkNotNull(subnets, SUBNET_NOT_NULL);
-        if (subnets != null) {
-            for (Subnet subnet : subnets) {
-                if (!subnetStore.containsKey(subnet.id())) {
-                    log.debug("The subnet is not exist whose identifier is {}",
-                              subnet.id().toString());
-                    return false;
-                }
+        for (Subnet subnet : subnets) {
+            if (!subnetStore.containsKey(subnet.id())) {
+                log.debug("The subnet is not exist whose identifier is {}",
+                          subnet.id().toString());
+                return false;
+            }
 
-                subnetStore.put(subnet.id(), subnet);
+            subnetStore.put(subnet.id(), subnet);
 
-                if (!subnet.equals(subnetStore.get(subnet.id()))) {
-                    log.debug("The subnet is updated failed whose identifier is {}",
-                              subnet.id().toString());
-                    return false;
-                }
+            if (!subnet.equals(subnetStore.get(subnet.id()))) {
+                log.debug("The subnet is updated failed whose identifier is {}",
+                          subnet.id().toString());
+                return false;
             }
         }
         return true;
@@ -167,14 +165,12 @@
     @Override
     public boolean removeSubnets(Iterable<SubnetId> subnetIds) {
         checkNotNull(subnetIds, SUBNET_ID_NULL);
-        if (subnetIds != null) {
-            for (SubnetId subnetId : subnetIds) {
-                subnetStore.remove(subnetId);
-                if (subnetStore.containsKey(subnetId)) {
-                    log.debug("The subnet created is failed whose identifier is {}",
-                              subnetId.toString());
-                    return false;
-                }
+        for (SubnetId subnetId : subnetIds) {
+             subnetStore.remove(subnetId);
+            if (subnetStore.containsKey(subnetId)) {
+                log.debug("The subnet created is failed whose identifier is {}",
+                          subnetId.toString());
+                return false;
             }
         }
         return true;