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

Diff for /pegasus/src/Pegasus/ProviderManager2/OperationResponseHandler.cpp between version 1.11.8.1 and 1.13

version 1.11.8.1, 2005/12/30 22:01:03 version 1.13, 2006/01/30 16:18:01
Line 1 
Line 1 
 //%2005////////////////////////////////////////////////////////////////////////  //%2006////////////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
 // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems. // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
Line 8 
Line 8 
 // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group. // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
 // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.; // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
 // EMC Corporation; VERITAS Software Corporation; The Open Group. // EMC Corporation; VERITAS Software Corporation; The Open Group.
   // Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   // EMC Corporation; Symantec Corporation; The Open Group.
 // //
 // Permission is hereby granted, free of charge, to any person obtaining a copy // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to // of this software and associated documentation files (the "Software"), to
Line 112 
Line 114 
  
 void OperationResponseHandler::setStatus( void OperationResponseHandler::setStatus(
     const Uint32 code,     const Uint32 code,
     const ContentLanguages & langs,      const ContentLanguageList & langs,
     const String & message)     const String & message)
 { {
     _response->cimException =     _response->cimException =
Line 276 
Line 278 
     // operation.     // operation.
     CIMClass cimClass;     CIMClass cimClass;
  
     CIMRepository * repository = 0;  
   
     try     try
     {     {
         CachedClassDefinitionContainer container =         CachedClassDefinitionContainer container =
             request->operationContext.get(CachedClassDefinitionContainer::NAME);             request->operationContext.get(CachedClassDefinitionContainer::NAME);
  
         cimClass = container.getClass();         cimClass = container.getClass();
 #ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT  
         RepositoryContainer repContainer =  
             request->operationContext.get(RepositoryContainer::NAME);  
         repository = repContainer.getRepository();  
 #endif //PEGASUS_EMBEDDED_INSTANCE_SUPPORT  
     }     }
     catch(Exception &)     catch(Exception &)
     {     {
Line 300 
Line 296 
         ObjectNormalizer(         ObjectNormalizer(
             cimClass,             cimClass,
             request->includeQualifiers,             request->includeQualifiers,
             request->includeClassOrigin,              request->includeClassOrigin);
             request->nameSpace,  
             repository);  
     #endif     #endif
 } }
  
Line 398 
Line 392 
     // operation. If it does not exist, then this feature is disabled for this     // operation. If it does not exist, then this feature is disabled for this
     // operation.     // operation.
     CIMClass cimClass;     CIMClass cimClass;
     CIMRepository * repository = 0;  
  
     try     try
     {     {
Line 406 
Line 399 
             request->operationContext.get(CachedClassDefinitionContainer::NAME);             request->operationContext.get(CachedClassDefinitionContainer::NAME);
  
         cimClass = container.getClass();         cimClass = container.getClass();
 #ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT  
         RepositoryContainer repContainer =  
             request->operationContext.get(RepositoryContainer::NAME);  
         repository = repContainer.getRepository();  
 #endif // PEGASUS_EMBEDDED_INSTANCE_SUPPORT  
     }     }
     catch(Exception &)     catch(Exception &)
     {     {
Line 422 
Line 410 
         ObjectNormalizer(         ObjectNormalizer(
             cimClass,             cimClass,
             request->includeQualifiers,             request->includeQualifiers,
             request->includeClassOrigin,              request->includeClassOrigin);
             request->nameSpace,  
             repository);  
     #endif     #endif
 } }
  
Line 473 
Line 459 
     // operation. If it does not exist, then this feature is disabled for this     // operation. If it does not exist, then this feature is disabled for this
     // operation.     // operation.
     CIMClass cimClass;     CIMClass cimClass;
     CIMRepository * repository = 0;  
  
     try     try
     {     {
Line 481 
Line 466 
             request->operationContext.get(CachedClassDefinitionContainer::NAME);             request->operationContext.get(CachedClassDefinitionContainer::NAME);
  
         cimClass = container.getClass();         cimClass = container.getClass();
 #ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT  
         RepositoryContainer repContainer =  
             request->operationContext.get(RepositoryContainer::NAME);  
         repository = repContainer.getRepository();  
 #endif // PEGASUS_EMBEDDED_INSTANCE_SUPPORT  
     }     }
     catch(Exception &)     catch(Exception &)
     {     {
Line 497 
Line 477 
         ObjectNormalizer(         ObjectNormalizer(
             cimClass,             cimClass,
             false,             false,
             false,              false);
             request->nameSpace,  
             repository);  
     #endif     #endif
 } }
  
Line 1018 
Line 996 
     }     }
  
     // l10n     // l10n
     ContentLanguages contentLangs;      ContentLanguageList contentLangs;
  
     try     try
     {     {

Legend:
Removed from v.1.11.8.1  
changed lines
  Added in v.1.13
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2