(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.243 and 1.244

version 1.243, 2012/11/29 09:57:30 version 1.244, 2013/08/26 13:11:04
Line 978 
Line 978 
  
     // Start up the CIM Server     // Start up the CIM Server
  
     try  
     {  
 #if defined(PEGASUS_OS_TYPE_UNIX) #if defined(PEGASUS_OS_TYPE_UNIX)
         //         //
         // Lock the CIMSERVER_LOCK_FILE during CIM Server start-up to prevent         // Lock the CIMSERVER_LOCK_FILE during CIM Server start-up to prevent
Line 989 
Line 987 
         CString startupLockFileName = ConfigManager::getHomedPath(         CString startupLockFileName = ConfigManager::getHomedPath(
             PEGASUS_CIMSERVER_START_LOCK_FILE).getCString();             PEGASUS_CIMSERVER_START_LOCK_FILE).getCString();
  
       try
       {
   
         // Make sure the start-up lock file exists         // Make sure the start-up lock file exists
         FILE* startupLockFile;         FILE* startupLockFile;
         if ((startupLockFile = fopen(startupLockFileName, "w")) != 0)         if ((startupLockFile = fopen(startupLockFileName, "w")) != 0)
Line 997 
Line 998 
         }         }
  
         AutoFileLock fileLock(startupLockFileName);         AutoFileLock fileLock(startupLockFileName);
   #else
       try
       {
 #endif #endif
  
 #if defined(PEGASUS_OS_TYPE_UNIX) || defined(PEGASUS_OS_VMS) #if defined(PEGASUS_OS_TYPE_UNIX) || defined(PEGASUS_OS_VMS)
Line 1338 
Line 1342 
             parms);             parms);
         cerr << MessageLoader::getMessage(parms) << endl;         cerr << MessageLoader::getMessage(parms) << endl;
  
       //delete the start up lock file
   #if defined(PEGASUS_OS_TYPE_UNIX)
       System::removeFile(startupLockFileName);
   #endif
         deleteCIMServer();         deleteCIMServer();
         return 1;         return 1;
     }     }
  
       //delete the start up lock file
   #if defined(PEGASUS_OS_TYPE_UNIX)
       System::removeFile(startupLockFileName);
   #endif
     deleteCIMServer();     deleteCIMServer();
     return 0;     return 0;
 } }


Legend:
Removed from v.1.243  
changed lines
  Added in v.1.244

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2