(file) Return to cimserver.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Server

Diff for /pegasus/src/Server/cimserver.cpp between version 1.155 and 1.156

version 1.155, 2005/03/13 15:44:52 version 1.156, 2005/03/15 18:55:56
Line 324 
Line 324 
     cout << MessageLoader::getMessage(parms) << endl;     cout << MessageLoader::getMessage(parms) << endl;
 } }
  
   //This needs to be called at various points in the code depending on the platform and error conditions.
   //We need to delete the _cimServer reference on exit in order for the destructors to get called.
   void deleteCIMServer()
   {
       if (_cimServer)
       {
           delete _cimServer;
           _cimServer = 0;
       }
   }
   
 // l10n // l10n
 // //
 // Dummy function for the Thread object associated with the initial thread. // Dummy function for the Thread object associated with the initial thread.
Line 1156 
Line 1167 
     try     try
     {     {
  
   
   
   
   
     Monitor monitor;     Monitor monitor;
     //PEP#222     //PEP#222
     //CIMServer server(&monitor);     //CIMServer server(&monitor);
Line 1338 
Line 1345 
         if (daemonOption)         if (daemonOption)
                 _cimServerProcess->notify_parent(1);                 _cimServerProcess->notify_parent(1);
  
           deleteCIMServer();
         return 1;         return 1;
     }     }
  
       deleteCIMServer();
     return 0;     return 0;
 } }
  


Legend:
Removed from v.1.155  
changed lines
  Added in v.1.156

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2