Multiple fixes in various modules

[netvirt.git] / vpnservice / bgpmanager / bgpmanager-impl / src / main / java / org / opendaylight / netvirt / bgpmanager / oam / BgpCounters.java

diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpCounters.java b/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpCounters.java
index d1f73184ff6a3c0c00599ba7c72c81c33593fbc3..019b7d73ee25d1bd06dd4be9ea172b8653f5dd8c 100644 (file)
--- a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpCounters.java
+++ b/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpCounters.java
@@ -17,7 +17,6 @@ import java.net.*;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-//import org.opendaylight.bgpmanager.globals.BgpConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -158,7 +157,7 @@ public class BgpCounters extends TimerTask {
                 socket.close();
                 return;
             }
-            if (ip == (int)gt) {
+            if (ip == (int)gt || ip == (int)hash) {
                 break;
             } else if (ip == -1) {
                 LOGGER.error(sb.toString());
@@ -496,7 +495,6 @@ public class BgpCounters extends TimerTask {
         PrintWriter writer;
         boolean success;
 
-        System.gc();
         success = fileHndl.delete();
         if (!success) {
             try {