Fixing an NPE in GUI idle detect mechanism; ONOS-441

Change-Id: Id1edd74642915a266d9e935287b70cf5425c91f6

Fixing an NPE in GUI idle detect mechanism; ONOS-441
Change-Id: Id1edd74642915a266d9e935287b70cf5425c91f6
Thomas Vachuska
Commit bbc3b4b6c56bc4bbc5f4bc0131a9396884124b2a bbc3b4b6 1 parent a77d64ac
Showing 1 changed file with 7 additions and 6 deletions
web/gui/src/main/java/org/onosproject/gui/TopologyViewWebSocket.java
--- a/web/gui/src/main/java/org/onosproject/gui/TopologyViewWebSocket.java
View file @bbc3b4b
+++ b/web/gui/src/main/java/org/onosproject/gui/TopologyViewWebSocket.java
View file @bbc3b4b
@@ -168,13 +168,14 @@ public class TopologyViewWebSocket
      */
     synchronized boolean isIdle() {
         boolean idle = (System.currentTimeMillis() - lastActive) > MAX_AGE_MS;
-         if (idle || !connection.isOpen()) {
+         if (idle || (connection != null && !connection.isOpen())) {
             return true;
-         }
-         try {
-             control.sendControl(PING, PING_DATA, 0, PING_DATA.length);
-         } catch (IOException e) {
-             log.warn("Unable to send ping message due to: ", e);
+         } else if (connection != null) {
+             try {
+                 control.sendControl(PING, PING_DATA, 0, PING_DATA.length);
+             } catch (IOException e) {
+                 log.warn("Unable to send ping message due to: ", e);
+             }
         }
         return false;
     }