commit cd508a658e7d038d50b68d2cd8b8a9fe7dfcdced
author Simon Hunt <simon@onlab.us> Thu Oct 27 12:47:24 2016 -0700
committer Simon Hunt <simon@onlab.us> Thu Oct 27 12:47:24 2016 -0700
tree 07b7f2eb2f6e8af6742ad65ca9d8dee7a258b88a
parent 8601627219294821c0381063bf2b3d2f75ba8ee2

Removed redundant checks from Topo2Jsonifier.

Change-Id: I98af34fa2c14889af8acf716b410da24885f4330

web/gui/src/main/java/org/onosproject/ui/impl/topo/Topo2Jsonifier.java

diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/topo/Topo2Jsonifier.java b/web/gui/src/main/java/org/onosproject/ui/impl/topo/Topo2Jsonifier.java
index 9e4beb6..36118ab 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/topo/Topo2Jsonifier.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/topo/Topo2Jsonifier.java
@@ -216,13 +216,8 @@
             return payload;
         }
         payload.put("id", region.idAsString());
-        if (subRegions != null) {
-            payload.set("subregions", jsonSubRegions(subRegions));
-        }
-
-        if (links != null) {
-            payload.set("links", jsonLinks(links));
-        }
+        payload.set("subregions", jsonSubRegions(subRegions));
+        payload.set("links", jsonLinks(links));
 
         List<String> layerTags = region.layerOrder();
         List<Set<UiNode>> splitDevices = splitByLayer(layerTags, region.devices());