From 67d44d6a5229cbaa69f9ab71f32edbaa20074268 Mon Sep 17 00:00:00 2001 From: Nikolas Hermanns Date: Mon, 20 Jun 2016 15:38:00 +0000 Subject: [PATCH] Fix for upstream quagga: vtysh using # Change-Id: I358cf88d81ca93509fd905eb6bed69e64facf024 Signed-off-by: Nikolas Hermanns --- .../java/org/opendaylight/bgpmanager/VtyshCli.java | 12 ++++++++---- .../org/opendaylight/bgpmanager/oam/BgpCounters.java | 4 +++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/VtyshCli.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/VtyshCli.java index faef7b4c..743c0124 100644 --- a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/VtyshCli.java +++ b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/VtyshCli.java @@ -126,7 +126,7 @@ public class VtyshCli extends OsgiCommandSupport { StringBuilder sb = new StringBuilder(); int ip = 0, ret; StringBuilder temp, temp2; - char ch, gt = '>'; + char ch, gt = '>', hashChar = '#'; inputBgpCmd.append("show " + cmd); @@ -187,8 +187,12 @@ public class VtyshCli extends OsgiCommandSupport { socket.close(); return; } - if (ip == (int) gt) { - sb.append(gt); + if ((ip == (int) gt) || (ip == (int)hashChar)) { + if (ip == (int) gt) { + sb.append(gt); + } else { + sb.append(hashChar); + } break; } else if (ip == -1) { System.out.println(sb.toString()); @@ -215,7 +219,7 @@ public class VtyshCli extends OsgiCommandSupport { socket.close(); return; } - if (ip == (int) gt) { + if ((ip == (int) gt) || (ip == (int) hashChar)) { break; } else if (ip == -1) { System.out.println(sb.toString()); diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/oam/BgpCounters.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/oam/BgpCounters.java index b14c8fc5..fe99848c 100644 --- a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/oam/BgpCounters.java +++ b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/oam/BgpCounters.java @@ -134,7 +134,9 @@ public class BgpCounters extends TimerTask { socket.close(); return; } - if (ret == -1) { + if ((ret == (int) gt) || (ret == (int)hash)) { + break; + } else if (ret == -1) { LOGGER.error("Connection closed by BGPd."); socket.close(); return; -- 2.36.6