1 files changed, 10 insertions, 10 deletions
diff --git a/cpp/src/IceGrid/ServerAdapterI.cpp b/cpp/src/IceGrid/ServerAdapterI.cpp
index b6835e6d90f..4529bf4e8d8 100644
--- a/cpp/src/IceGrid/ServerAdapterI.cpp
+++ b/cpp/src/IceGrid/ServerAdapterI.cpp
@@ -128,16 +128,16 @@ ServerAdapterI::setDirectProxy(const Ice::ObjectPrx& prx, const Ice::Current&)
     // We don't allow to override an existing proxy by another non
     // null proxy if the server is not inactive.
     //
-    // TODO: This check would fail with the new refreshPublishedEndpoints() call.
-    //       Is some protesction still needed though?
-    //
-    //if(prx && _proxy)
-    //{
-    //    if(_server->getState() == Active)
-    //    {
-    //        throw AdapterActiveException();
-    //    }
-    //}
+    if(!_node->allowEndpointsOverride())
+    {
+        if(prx && _proxy)
+        {
+            if(_server->getState() == Active)
+            {
+                throw AdapterActiveException();
+            }
+        }
+    }
 
     bool updated = _proxy != prx;
     _proxy = prx;