Fixed bug 1671 and other minor fixes

1 files changed, 14 insertions, 11 deletions

diff --git a/cpp/src/IceGrid/Topics.cpp b/cpp/src/IceGrid/Topics.cpp
index 101ea3473c8..ff87fae0d72 100644
--- a/cpp/src/IceGrid/Topics.cpp
+++ b/cpp/src/IceGrid/Topics.cpp
@@ -276,19 +276,22 @@ RegistryObserverTopic::registryDown(const string& name)
     {
 	return;
     }
+
+    if(_registries.find(name) == _registries.end())
+    {
+	return;
+    }
+
     updateSerial(_serial + 1);
-    if(_registries.find(name) != _registries.end())
+    _registries.erase(name);
+    try
     {
-	_registries.erase(name);
-	try
-	{
-	    _publisher->registryDown(name);
-	}
-	catch(const Ice::LocalException& ex)
-	{
-	    Ice::Warning out(_logger);
-	    out << "unexpected exception while publishing `registryDown' update:\n" << ex;    
-	}
+	_publisher->registryDown(name);
+    }
+    catch(const Ice::LocalException& ex)
+    {
+	Ice::Warning out(_logger);
+	out << "unexpected exception while publishing `registryDown' update:\n" << ex;    
     }
 }