Revert "ICE-5606 renamed ServantLocator::deactivate to destroy"

This reverts commit 710af6e9ea945157ef8b92112167aeda01b6d383.

1 files changed, 24 insertions, 24 deletions

diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp
index b948faadd9f..089f2d49c26 100644
--- a/cpp/src/IceGrid/IceGridNode.cpp
+++ b/cpp/src/IceGrid/IceGridNode.cpp
@@ -41,14 +41,14 @@ namespace
 class ProcessI : public Process
 {
 public:
-
+    
     ProcessI(const ActivatorPtr&, const ProcessPtr&);
 
     virtual void shutdown(const Current&);
     virtual void writeMessage(const std::string&, Int, const Current&);
-
+    
 private:
-
+    
     ActivatorPtr _activator;
     ProcessPtr _origProcess;
 };
@@ -114,7 +114,7 @@ public:
     {
     }
 
-    virtual void destroy(const string&)
+    virtual void deactivate(const string&)
     {
     }
 
@@ -145,15 +145,15 @@ setNoIndexingAttribute(const string& pa)
 }
 #endif
 
-}
+} 
 
 
-CollocatedRegistry::CollocatedRegistry(const CommunicatorPtr& com,
-                                       const ActivatorPtr& activator,
+CollocatedRegistry::CollocatedRegistry(const CommunicatorPtr& com, 
+                                       const ActivatorPtr& activator, 
                                        bool nowarn,
                                        bool readonly,
                                        const string& initFromReplica) :
-    RegistryI(com, new TraceLevels(com, "IceGrid.Registry"), nowarn, readonly, initFromReplica),
+    RegistryI(com, new TraceLevels(com, "IceGrid.Registry"), nowarn, readonly, initFromReplica), 
     _activator(activator)
 {
 }
@@ -164,7 +164,7 @@ CollocatedRegistry::shutdown()
     _activator->shutdown();
 }
 
-ProcessI::ProcessI(const ActivatorPtr& activator, const ProcessPtr& origProcess) :
+ProcessI::ProcessI(const ActivatorPtr& activator, const ProcessPtr& origProcess) : 
     _activator(activator),
     _origProcess(origProcess)
 {
@@ -264,7 +264,7 @@ NodeService::startImpl(int argc, char* argv[], int& status)
             }
 
             initFromReplica = argv[++i];
-        }
+        } 
         else if(strcmp(argv[i], "--deploy") == 0)
         {
             if(i + 1 >= argc)
@@ -311,7 +311,7 @@ NodeService::startImpl(int argc, char* argv[], int& status)
         out << "setting `Ice.ThreadPool.Server.Size' is not useful, ";
         out << "you should set individual adapter thread pools instead.";
     }
-
+    
     setupThreadPool(properties, "IceGrid.Node.ThreadPool", 1, 100);
 
     //
@@ -332,7 +332,7 @@ NodeService::startImpl(int argc, char* argv[], int& status)
         }
 
         communicator()->setDefaultLocator(_registry->getLocator());
-
+        
         //
         // Set the default locator property to point to the collocated
         // locator (this property is passed by the activator to each
@@ -367,7 +367,7 @@ NodeService::startImpl(int argc, char* argv[], int& status)
             FileException ex(__FILE__, __LINE__);
             ex.path = dataPath;
             ex.error = IceInternal::getSystemErrno();
-
+      
             ServiceError err(this);
             err << "property `IceGrid.Node.Data' is set to an invalid path:\n" << ex;
             return false;
@@ -378,7 +378,7 @@ NodeService::startImpl(int argc, char* argv[], int& status)
         //
         if(dataPath[dataPath.length() - 1] != '/')
         {
-            dataPath += "/";
+            dataPath += "/"; 
         }
 
         IcePatch2::createDirectory(dataPath + "servers");
@@ -507,7 +507,7 @@ NodeService::startImpl(int argc, char* argv[], int& status)
     _node = new NodeI(_adapter, *_sessions, _activator, _timer, traceLevels, nodeProxy, name, mapper, instanceName);
     _adapter->add(_node, nodeProxy->ice_getIdentity());
 
-    _adapter->addServantLocator(new DefaultServantLocator(new NodeServerAdminRouter(_node)),
+    _adapter->addServantLocator(new DefaultServantLocator(new NodeServerAdminRouter(_node)), 
                                 _node->getServerAdminCategory());
 
     //
@@ -517,7 +517,7 @@ NodeService::startImpl(int argc, char* argv[], int& status)
 
     //
     // Ensures that the locator is reachable.
-    //
+    // 
     if(!nowarn)
     {
         try
@@ -557,7 +557,7 @@ NodeService::startImpl(int argc, char* argv[], int& status)
             //
             // Some plug-in removed the Process facet, so we don't replace it.
             // (unlikely error though)
-            //
+            // 
         }
     }
 
@@ -602,15 +602,15 @@ NodeService::startImpl(int argc, char* argv[], int& status)
             Ice::Identity regId;
             regId.category = instanceName;
             regId.name = "Registry";
-
+            
             RegistryPrx registry = RegistryPrx::checkedCast(communicator()->getDefaultLocator()->findObjectById(regId));
             if(!registry)
             {
                 throw "invalid registry";
             }
-
+        
             registry = registry->ice_preferSecure(true); // Use SSL if available.
-
+            
             IceGrid::AdminSessionPrx session;
             if(communicator()->getProperties()->getPropertyAsInt("IceGridAdmin.AuthenticateUsingSSL"))
             {
@@ -626,14 +626,14 @@ NodeService::startImpl(int argc, char* argv[], int& status)
                     getline(cin, id);
                     id = IceUtilInternal::trim(id);
                 }
-
+                
                 if(password.empty())
                 {
                     cout << "password: " << flush;
                     getline(cin, password);
                     password = IceUtilInternal::trim(password);
                 }
-
+                
                 session = registry->createAdminSession(id, password);
             }
             assert(session);
@@ -659,7 +659,7 @@ NodeService::startImpl(int argc, char* argv[], int& status)
         catch(const AccessDeniedException& ex)
         {
             ServiceWarning warn(this);
-            warn << "failed to deploy application `" << desc << "':\n"
+            warn << "failed to deploy application `" << desc << "':\n" 
                  << "registry database is locked by `" << ex.lockUserId << "'";
         }
         catch(const std::exception& ex)
@@ -797,7 +797,7 @@ NodeService::stop()
 }
 
 CommunicatorPtr
-NodeService::initializeCommunicator(int& argc, char* argv[],
+NodeService::initializeCommunicator(int& argc, char* argv[], 
                                     const InitializationData& initializationData)
 {
     InitializationData initData = initializationData;