summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/IceGridNode.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2019-01-08 10:42:46 +0100
committerBenoit Foucher <benoit@zeroc.com>2019-01-08 10:42:46 +0100
commitfbdfc06d94a7e976a19a3087ad4f1fb733155d40 (patch)
tree23ba0899546efe41a479a5c1350e83b8e5fb430b /cpp/src/IceGrid/IceGridNode.cpp
parentRuby 2.6 bugfix (diff)
downloadice-fbdfc06d94a7e976a19a3087ad4f1fb733155d40.tar.bz2
ice-fbdfc06d94a7e976a19a3087ad4f1fb733155d40.tar.xz
ice-fbdfc06d94a7e976a19a3087ad4f1fb733155d40.zip
Disable IceGrid GUI popup dialog that shows up if the IceBox observer can't be registered, backward compatibility fix for IceGrid node
Diffstat (limited to 'cpp/src/IceGrid/IceGridNode.cpp')
-rw-r--r--cpp/src/IceGrid/IceGridNode.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp
index 0524f923a53..5a2d436bd8c 100644
--- a/cpp/src/IceGrid/IceGridNode.cpp
+++ b/cpp/src/IceGrid/IceGridNode.cpp
@@ -460,6 +460,13 @@ NodeService::startImpl(int argc, char* argv[], int& status)
_adapter->addDefaultServant(new NodeServerAdminRouter(_node), _node->getServerAdminCategory());
//
+ // Keep the old default servant for backward compatibility with IceGrid registries 3.5 that
+ // still forward requests to this category. This can be removed when we decide to break
+ // backward compatibility with 3.5 registries.
+ //
+ _adapter->addDefaultServant(new NodeServerAdminRouter(_node), instanceName + "-NodeRouter");
+
+ //
// Start the platform info thread if needed.
//
_node->getPlatformInfo().start();