From 2014cdb79f9bf5dd73caabcbd1107fc72ae36986 Mon Sep 17 00:00:00 2001 From: Ray Milkey Date: Wed, 16 May 2018 09:12:24 -0700 Subject: [PATCH] Sonar objects to non-static members in servlet objects Change-Id: I4544fcececda5146c03ba1d551cc0a119b29c502 --- .../java/org/onosproject/ui/impl/UiWebSocketServlet.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/UiWebSocketServlet.java b/web/gui/src/main/java/org/onosproject/ui/impl/UiWebSocketServlet.java index 2db0c61979..650f7273da 100644 --- a/web/gui/src/main/java/org/onosproject/ui/impl/UiWebSocketServlet.java +++ b/web/gui/src/main/java/org/onosproject/ui/impl/UiWebSocketServlet.java @@ -40,12 +40,12 @@ public class UiWebSocketServlet extends WebSocketServlet { private static UiWebSocketServlet instance; private static final Object INSTANCE_LOCK = new Object(); - private ServiceDirectory directory = new DefaultServiceDirectory(); + private static ServiceDirectory directory = new DefaultServiceDirectory(); private final Set sockets = Sets.newConcurrentHashSet(); private final Timer timer = new Timer(); private final TimerTask pruner = new Pruner(); - private boolean isStopped = false; + private static boolean isStopped = false; /** * Closes all currently open UI web-sockets. @@ -53,7 +53,7 @@ public class UiWebSocketServlet extends WebSocketServlet { public static void closeAll() { synchronized (INSTANCE_LOCK) { if (instance != null) { - instance.isStopped = true; + isStopped = true; instance.sockets.forEach(UiWebSocket::close); instance.sockets.clear(); instance.pruner.cancel();