(file) Return to UserFileHandler.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Security / UserManager

Diff for /pegasus/src/Pegasus/Security/UserManager/UserFileHandler.cpp between version 1.29 and 1.30

version 1.29, 2008/08/15 23:14:02 version 1.30, 2008/09/16 18:37:05
Line 42 
Line 42 
 #include <Pegasus/Common/Logger.h> #include <Pegasus/Common/Logger.h>
 #include <Pegasus/Common/System.h> #include <Pegasus/Common/System.h>
 #include <Pegasus/Common/Tracer.h> #include <Pegasus/Common/Tracer.h>
 #include <Pegasus/Common/IPCExceptions.h>  
  
 #include <Pegasus/Config/ConfigManager.h> #include <Pegasus/Config/ConfigManager.h>
  
Line 184 
Line 183 
     // at any given time     // at any given time
     //     //
  
     try  
     {  
         if (!_mutex->timed_lock(_MUTEX_TIMEOUT))         if (!_mutex->timed_lock(_MUTEX_TIMEOUT))
         {         {
             throw PEGASUS_CIM_EXCEPTION_L(CIM_ERR_FAILED,             throw PEGASUS_CIM_EXCEPTION_L(CIM_ERR_FAILED,
Line 194 
Line 191 
                     "Timed out while attempting to perform the requested "                     "Timed out while attempting to perform the requested "
                         "operation. Try the operation again."));                         "operation. Try the operation again."));
         }         }
     }  
     catch (WaitFailed&)  
     {  
         // ATTN: This is an error case, not a timeout scenario  
         throw PEGASUS_CIM_EXCEPTION_L(CIM_ERR_FAILED,  
             MessageLoaderParms(  
                 "Security.UserManager.UserFileHandler.TIMEOUT",  
                 "Timed out while attempting to perform the requested "  
                     "operation. Try the operation again."));  
     }  
  
     switch (operation)     switch (operation)
     {     {


Legend:
Removed from v.1.29  
changed lines
  Added in v.1.30

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2