Ignore empty address

apache · Jan 7, 2021 · ba5d932 · ba5d932
1 parent 0deb207
commit ba5d932
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/brpc/policy/discovery_naming_service.cpp b/src/brpc/policy/discovery_naming_service.cpp
@@ -277,7 +277,9 @@ int DiscoveryClient::DoRegister() {
     std::vector<butil::StringPiece> addrs;
     butil::SplitString(_params.addrs, ',', &addrs);
     for (size_t i = 0; i < addrs.size(); ++i) {
-        os << "&addrs=" << addrs[i];
+        if (!addrs[i].empty()) {
+            os << "&addrs=" << addrs[i];
+        }
     }
 
     os << "&env=" << _params.env

diff --git a/test/brpc_naming_service_unittest.cpp b/test/brpc_naming_service_unittest.cpp
@@ -627,6 +627,7 @@ class DiscoveryNamingServiceImpl : public test::DiscoveryNamingService {
     bool HasAddr(const std::string& addr) const {
         return _addrs.find(addr) != _addrs.end();
     }
+    int AddrCount() const { return _addrs.size(); }
 
 private:
     int _renew_count;
@@ -685,12 +686,14 @@ TEST(NamingServiceTest, discovery_sanity) {
     ASSERT_FALSE(svc.HasAddr("http://10.0.0.1:8000"));
 
     // addrs splitted by `,'
-    dparam.addrs = ("grpc://10.0.0.1:8000,http://10.0.0.1:8000");
+    dparam.addrs = ",grpc://10.0.0.1:8000,,http://10.0.0.1:8000,";
     {
         brpc::policy::DiscoveryClient dc;
         ASSERT_EQ(0, dc.Register(dparam));
         ASSERT_TRUE(svc.HasAddr("grpc://10.0.0.1:8000"));
         ASSERT_TRUE(svc.HasAddr("http://10.0.0.1:8000"));
+        ASSERT_FALSE(svc.HasAddr(std::string()));
+        ASSERT_EQ(2, svc.AddrCount());
     }
 }