Out of Memory when static Routes are configured with unresolved next hop

[controller.git] / opendaylight / hosttracker / implementation / src / main / java / org / opendaylight / controller / hosttracker / internal / HostTracker.java

diff --git a/opendaylight/hosttracker/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/HostTracker.java b/opendaylight/hosttracker/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/HostTracker.java
index 6b7bac03e9bdcfc472ad3dce7cc2c10d1f8dd096..5aa8f10706cae4e774455895fc30642a1fa8049d 100644 (file)
--- a/opendaylight/hosttracker/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/HostTracker.java
+++ b/opendaylight/hosttracker/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/HostTracker.java
@@ -97,7 +97,7 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw
     private Timer timer;
     private Timer arp_refresh_timer;
     private String containerName = null;
     private Timer timer;
     private Timer arp_refresh_timer;
     private String containerName = null;

-
+    private ExecutorService executor;

     private static class ARPPending {
         protected InetAddress hostIP;
         protected short sent_count;
     private static class ARPPending {
         protected InetAddress hostIP;
         protected short sent_count;


@@ -158,7 +158,7 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw
 
         timer = new Timer();
         timer.schedule(new OutStandingARPHandler(), 4000, 4000);
 
         timer = new Timer();
         timer.schedule(new OutStandingARPHandler(), 4000, 4000);

-
+        executor = Executors.newFixedThreadPool(2);

         /* ARP Refresh Timer to go off every 5 seconds to implement ARP aging */
         arp_refresh_timer = new Timer();
         arp_refresh_timer.schedule(new ARPRefreshHandler(), 5000, 5000);
         /* ARP Refresh Timer to go off every 5 seconds to implement ARP aging */
         arp_refresh_timer = new Timer();
         arp_refresh_timer.schedule(new ARPRefreshHandler(), 5000, 5000);


@@ -296,7 +296,6 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw
 
     @Override
     public Future<HostNodeConnector> discoverHost(InetAddress networkAddress) {
 
     @Override
     public Future<HostNodeConnector> discoverHost(InetAddress networkAddress) {

-        ExecutorService executor = Executors.newFixedThreadPool(1);

         if (executor == null) {
             logger.error("discoverHost: Null executor");
             return null;
         if (executor == null) {
             logger.error("discoverHost: Null executor");
             return null;


@@ -1349,6 +1348,7 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw
      *
      */
     void stop() {
      *
      */
     void stop() {

+        executor.shutdown();

     }
 
     @Override
     }
 
     @Override