summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/Client.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2017-08-18 11:42:22 +0200
committerBenoit Foucher <benoit@zeroc.com>2017-08-18 14:17:15 +0200
commit229c74bc983df74931bd95ac7f1855ed34a3e541 (patch)
treea0bb86501c6371648ce7475993c0ec52fc647241 /cpp/src/IceGrid/Client.cpp
parentFix for ICE-8417 - Removed bogus servantLocatorFinished call, also fixed inva... (diff)
downloadice-229c74bc983df74931bd95ac7f1855ed34a3e541.tar.bz2
ice-229c74bc983df74931bd95ac7f1855ed34a3e541.tar.xz
ice-229c74bc983df74931bd95ac7f1855ed34a3e541.zip
Fixed ICE-8407 - Removed Slice checksums checks from icegridadmin/iceboxadmin
Diffstat (limited to 'cpp/src/IceGrid/Client.cpp')
-rw-r--r--cpp/src/IceGrid/Client.cpp26
1 files changed, 1 insertions, 25 deletions
diff --git a/cpp/src/IceGrid/Client.cpp b/cpp/src/IceGrid/Client.cpp
index 3e587f8a88e..3132784bb9d 100644
--- a/cpp/src/IceGrid/Client.cpp
+++ b/cpp/src/IceGrid/Client.cpp
@@ -767,33 +767,9 @@ Client::run(StringSeq& originalArgs)
keepAlive->start();
}
- AdminPrx admin = session->getAdmin();
-
- SliceChecksumDict serverChecksums = admin->getSliceChecksums();
- SliceChecksumDict localChecksums = sliceChecksums();
-
- //
- // The following slice types are only used by the admin CLI.
- //
- localChecksums.erase("::IceGrid::FileParser");
- localChecksums.erase("::IceGrid::ParseException");
-
- for(SliceChecksumDict::const_iterator q = localChecksums.begin(); q != localChecksums.end(); ++q)
- {
- SliceChecksumDict::const_iterator r = serverChecksums.find(q->first);
- if(r == serverChecksums.end())
- {
- consoleErr << appName() << ": server is using unknown Slice type `" << q->first << "'" << endl;
- }
- else if(q->second != r->second)
- {
- consoleErr << appName() << ": server is using a different Slice definition of `" << q->first << "'" << endl;
- }
- }
-
{
Lock sync(*this);
- _parser = Parser::createParser(communicator(), session, admin, commands.empty());
+ _parser = Parser::createParser(communicator(), session, session->getAdmin(), commands.empty());
}
if(!commands.empty()) // Commands were given