NeighbourMessageService: Don't push ARP flows when there are no handlers registered.

Fixes ONOS-5277

Change-Id: Ie7ff6ed10d14f4ec8f96327d323ace50c85c8a19

@@ -111,7 +111,7 @@ public class NeighbourResolutionManager implements NeighbourResolutionService {
     private static final String APP_NAME = "org.onosproject.neighbour";
     private static final String APP_NAME = "org.onosproject.neighbour";
     private ApplicationId appId;
     private ApplicationId appId;
 
 
-    private SetMultimap<ConnectPoint, NeighbourHandlerRegistration> packetHandlers =
+    private final SetMultimap<ConnectPoint, NeighbourHandlerRegistration> packetHandlers =
             Multimaps.synchronizedSetMultimap(HashMultimap.create());
             Multimaps.synchronizedSetMultimap(HashMultimap.create());
 
 
     private final InternalPacketProcessor processor = new InternalPacketProcessor();
     private final InternalPacketProcessor processor = new InternalPacketProcessor();
@@ -146,8 +146,12 @@ public class NeighbourResolutionManager implements NeighbourResolutionService {
                     ndpEnabled ? "enabled" : "disabled");
                     ndpEnabled ? "enabled" : "disabled");
         }
         }
 
 
+        synchronized (packetHandlers) {
+            if (!packetHandlers.isEmpty()) {
                 requestPackets();
                 requestPackets();
             }
             }
+        }
+    }
 
 
     private void requestPackets() {
     private void requestPackets() {
         packetService.requestPackets(buildArpSelector(), CONTROL, appId);
         packetService.requestPackets(buildArpSelector(), CONTROL, appId);
@@ -199,30 +203,47 @@ public class NeighbourResolutionManager implements NeighbourResolutionService {
     public void registerNeighbourHandler(ConnectPoint connectPoint,
     public void registerNeighbourHandler(ConnectPoint connectPoint,
                                          NeighbourMessageHandler handler,
                                          NeighbourMessageHandler handler,
                                          ApplicationId appId) {
                                          ApplicationId appId) {
-        packetHandlers.put(connectPoint, new HandlerRegistration(handler, appId));
+        register(connectPoint, new HandlerRegistration(handler, appId));
     }
     }
 
 
     @Override
     @Override
     public void registerNeighbourHandler(Interface intf,
     public void registerNeighbourHandler(Interface intf,
                                          NeighbourMessageHandler handler,
                                          NeighbourMessageHandler handler,
                                          ApplicationId appId) {
                                          ApplicationId appId) {
-        packetHandlers.put(intf.connectPoint(),
-                new HandlerRegistration(handler, intf, appId));
+        register(intf.connectPoint(), new HandlerRegistration(handler, intf, appId));
+    }
+
+    private void register(ConnectPoint connectPoint, HandlerRegistration registration) {
+        synchronized (packetHandlers) {
+            if (packetHandlers.isEmpty()) {
+                requestPackets();
+            }
+            packetHandlers.put(connectPoint, registration);
+        }
     }
     }
 
 
     @Override
     @Override
     public void unregisterNeighbourHandler(ConnectPoint connectPoint,
     public void unregisterNeighbourHandler(ConnectPoint connectPoint,
                                            NeighbourMessageHandler handler,
                                            NeighbourMessageHandler handler,
                                            ApplicationId appId) {
                                            ApplicationId appId) {
-        packetHandlers.remove(connectPoint, new HandlerRegistration(handler, appId));
+        unregister(connectPoint, new HandlerRegistration(handler, appId));
     }
     }
 
 
     @Override
     @Override
     public void unregisterNeighbourHandler(Interface intf,
     public void unregisterNeighbourHandler(Interface intf,
                                            NeighbourMessageHandler handler,
                                            NeighbourMessageHandler handler,
                                            ApplicationId appId) {
                                            ApplicationId appId) {
-        packetHandlers.remove(intf.connectPoint(),
-                new HandlerRegistration(handler, intf, appId));
+        unregister(intf.connectPoint(), new HandlerRegistration(handler, intf, appId));
+    }
+
+    private void unregister(ConnectPoint connectPoint, HandlerRegistration registration) {
+        synchronized (packetHandlers) {
+            packetHandlers.remove(connectPoint, registration);
+
+            if (packetHandlers.isEmpty()) {
+                cancelPackets();
+            }
+        }
     }
     }
 
 
     @Override
     @Override
@@ -236,6 +257,10 @@ public class NeighbourResolutionManager implements NeighbourResolutionService {
                     it.remove();
                     it.remove();
                 }
                 }
             }
             }
+
+            if (packetHandlers.isEmpty()) {
+                cancelPackets();
+            }
         }
         }
     }
     }
 
 
@@ -317,7 +342,6 @@ public class NeighbourResolutionManager implements NeighbourResolutionService {
                 .anyMatch(intfAddress -> intfAddress.ipAddress().equals(ip));
                 .anyMatch(intfAddress -> intfAddress.ipAddress().equals(ip));
     }
     }
 
 
-
     private void reply(NeighbourMessageContext context, MacAddress targetMac) {
     private void reply(NeighbourMessageContext context, MacAddress targetMac) {
         switch (context.protocol()) {
         switch (context.protocol()) {
         case ARP:
         case ARP: