(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.2 and 1.12

version 1.11.8.2, 2006/02/10 16:12:57 version 1.12, 2006/01/10 19:41:20
Line 1 
Line 1 
 //%2006////////////////////////////////////////////////////////////////////////  //%2005////////////////////////////////////////////////////////////////////////
 // //
 // 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 278 
Line 276 
     // operation.     // operation.
     CIMClass cimClass;     CIMClass cimClass;
  
     NormalizerContext * context = 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  
         NormalizerContextContainer contextContainer =  
             request->operationContext.get(NormalizerContextContainer::NAME);  
         context = contextContainer.getContext();  
 #endif //PEGASUS_EMBEDDED_INSTANCE_SUPPORT  
     }     }
     catch(Exception &)     catch(Exception &)
     {     {
Line 302 
Line 294 
         ObjectNormalizer(         ObjectNormalizer(
             cimClass,             cimClass,
             request->includeQualifiers,             request->includeQualifiers,
             request->includeClassOrigin,              request->includeClassOrigin);
             request->nameSpace,  
             context);  
     #endif     #endif
 } }
  
Line 400 
Line 390 
     // 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;
     NormalizerContext * context = 0;  
  
     try     try
     {     {
Line 408 
Line 397 
             request->operationContext.get(CachedClassDefinitionContainer::NAME);             request->operationContext.get(CachedClassDefinitionContainer::NAME);
  
         cimClass = container.getClass();         cimClass = container.getClass();
 #ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT  
         NormalizerContextContainer contextContainer =  
             request->operationContext.get(NormalizerContextContainer::NAME);  
         context = contextContainer.getContext();  
 #endif // PEGASUS_EMBEDDED_INSTANCE_SUPPORT  
     }     }
     catch(Exception &)     catch(Exception &)
     {     {
Line 424 
Line 408 
         ObjectNormalizer(         ObjectNormalizer(
             cimClass,             cimClass,
             request->includeQualifiers,             request->includeQualifiers,
             request->includeClassOrigin,              request->includeClassOrigin);
             request->nameSpace,  
             context);  
     #endif     #endif
 } }
  
Line 475 
Line 457 
     // 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;
     NormalizerContext * context = 0;  
  
     try     try
     {     {
Line 483 
Line 464 
             request->operationContext.get(CachedClassDefinitionContainer::NAME);             request->operationContext.get(CachedClassDefinitionContainer::NAME);
  
         cimClass = container.getClass();         cimClass = container.getClass();
 #ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT  
         NormalizerContextContainer contextContainer =  
             request->operationContext.get(NormalizerContextContainer::NAME);  
         context = contextContainer.getContext();  
 #endif // PEGASUS_EMBEDDED_INSTANCE_SUPPORT  
     }     }
     catch(Exception &)     catch(Exception &)
     {     {
Line 499 
Line 475 
         ObjectNormalizer(         ObjectNormalizer(
             cimClass,             cimClass,
             false,             false,
             false,              false);
             request->nameSpace,  
             context);  
     #endif     #endif
 } }
  

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