Fixed ICE-8407 - Removed Slice checksums checks from icegridadmin/iceboxadmin

2 files changed, 1 insertions, 40 deletions

diff --git a/cpp/src/IceBox/Admin.cpp b/cpp/src/IceBox/Admin.cpp
index 8767b14d378..e07c82cb239 100644
--- a/cpp/src/IceBox/Admin.cpp
+++ b/cpp/src/IceBox/Admin.cpp
@@ -141,21 +141,6 @@ Client::run(int argc, char* argv[])
         return EXIT_FAILURE;
     }
 
-    Ice::SliceChecksumDict serverChecksums = manager->getSliceChecksums();
-    Ice::SliceChecksumDict localChecksums = Ice::sliceChecksums();
-    for(Ice::SliceChecksumDict::const_iterator p = localChecksums.begin(); p != localChecksums.end(); ++p)
-    {
-        Ice::SliceChecksumDict::const_iterator q = serverChecksums.find(p->first);
-        if(q == serverChecksums.end())
-        {
-            consoleErr << appName() << ": server is using unknown Slice type `" << q->first << "'" << endl;
-        }
-        else if(p->second != q->second)
-        {
-            consoleErr << appName() << ": server is using a different Slice definition of `" << q->first << "'" << endl;
-        }
-    }
-
     for(vector<string>::const_iterator r = commands.begin(); r != commands.end(); ++r)
     {
         if((*r) == "shutdown")
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