From cd508a658e7d038d50b68d2cd8b8a9fe7dfcdced Mon Sep 17 00:00:00 2001
From: Simon Hunt <simon@onlab.us>
Date: Thu, 27 Oct 2016 12:47:24 -0700
Subject: [PATCH] Removed redundant checks from Topo2Jsonifier.

Change-Id: I98af34fa2c14889af8acf716b410da24885f4330
---
 .../org/onosproject/ui/impl/topo/Topo2Jsonifier.java     | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

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 9e4beb69d3..36118abb26 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 @@ class Topo2Jsonifier {
             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());