GUI Fixes.
Change-Id: I5b5de2b74b65f1af613e04e226ee633ee50f695d
diff --git a/web/gui/src/main/java/org/onlab/onos/gui/TopologyViewIntentFilter.java b/web/gui/src/main/java/org/onlab/onos/gui/TopologyViewIntentFilter.java
index 0f9a29b..2585b84 100644
--- a/web/gui/src/main/java/org/onlab/onos/gui/TopologyViewIntentFilter.java
+++ b/web/gui/src/main/java/org/onlab/onos/gui/TopologyViewIntentFilter.java
@@ -164,16 +164,18 @@
// Indicates whether the specified intent involves the given device.
private boolean isIntentRelevantToDevice(List<Intent> installables, Device device) {
- for (Intent installable : installables) {
- if (installable instanceof PathIntent) {
- PathIntent pathIntent = (PathIntent) installable;
- if (pathContainsDevice(pathIntent.path().links(), device.id())) {
- return true;
- }
- } else if (installable instanceof LinkCollectionIntent) {
- LinkCollectionIntent linksIntent = (LinkCollectionIntent) installable;
- if (pathContainsDevice(linksIntent.links(), device.id())) {
- return true;
+ if (installables != null) {
+ for (Intent installable : installables) {
+ if (installable instanceof PathIntent) {
+ PathIntent pathIntent = (PathIntent) installable;
+ if (pathContainsDevice(pathIntent.path().links(), device.id())) {
+ return true;
+ }
+ } else if (installable instanceof LinkCollectionIntent) {
+ LinkCollectionIntent linksIntent = (LinkCollectionIntent) installable;
+ if (pathContainsDevice(linksIntent.links(), device.id())) {
+ return true;
+ }
}
}
}