Fix NPE in visual topology 24/1324/1
authorAndrew Kim <andrekim@cisco.com>
Sat, 21 Sep 2013 16:35:25 +0000 (11:35 -0500)
committerAndrew Kim <andrekim@cisco.com>
Sat, 21 Sep 2013 16:35:25 +0000 (11:35 -0500)
Change-Id: I345b9ed2d1086e370681aa1985c9df8c16902859
Signed-off-by: Andrew Kim <andrekim@cisco.com>
opendaylight/web/topology/src/main/java/org/opendaylight/controller/topology/web/Topology.java

index f6a05882833ccc2f03851405f57e2b5480e159d4..29d2d2b4051a6b89ced33b5e17d81f4f59f47f62 100644 (file)
@@ -193,7 +193,11 @@ public class Topology implements IObjectReader, IConfigurationAware {
                 if (edgeIgnore(link)) {
                     continue;
                 }
-                for (Property p : properties.get(link)) {
+                Set<Property> props = properties.get(link);
+                if (props == null) {
+                    continue;
+                }
+                for (Property p : props) {
                     if (p instanceof Bandwidth) {
                         bandwidth = (Bandwidth) p;
                         break;