From 1acaa2112ff6a6a19bffeecebe83e1764903acdb Mon Sep 17 00:00:00 2001
From: Jose <jose@zeroc.com>
Date: Thu, 5 Dec 2019 16:34:52 +0100
Subject: Ignore null locator replies

---
 cpp/src/IceLocatorDiscovery/PluginI.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'cpp/src')

diff --git a/cpp/src/IceLocatorDiscovery/PluginI.cpp b/cpp/src/IceLocatorDiscovery/PluginI.cpp
index 92295c261c0..864e3c272c8 100644
--- a/cpp/src/IceLocatorDiscovery/PluginI.cpp
+++ b/cpp/src/IceLocatorDiscovery/PluginI.cpp
@@ -706,7 +706,18 @@ void
 LocatorI::foundLocator(const Ice::LocatorPrxPtr& locator)
 {
     Lock sync(*this);
-    if(!locator || (!_instanceName.empty() && locator->ice_getIdentity().category != _instanceName))
+
+    if(!locator)
+    {
+        if(_traceLevel > 2)
+        {
+            Ice::Trace out(_lookup->ice_getCommunicator()->getLogger(), "Lookup");
+            out << "ignoring locator reply: (null locator)";
+        }
+        return;
+    }
+
+    if(!_instanceName.empty() && locator->ice_getIdentity().category != _instanceName)
     {
         if(_traceLevel > 2)
         {
-- 
cgit v1.2.3