(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.15 and 1.16

version 1.15, 2006/05/02 20:27:00 version 1.16, 2006/07/21 18:44:08
Line 283 
Line 283 
     // operation.     // operation.
     CIMClass cimClass;     CIMClass cimClass;
  
     try      if(request->operationContext.contains(CachedClassDefinitionContainer::NAME))
     {     {
         CachedClassDefinitionContainer container =         CachedClassDefinitionContainer container =
             request->operationContext.get(CachedClassDefinitionContainer::NAME);              request->operationContext.get(
                   CachedClassDefinitionContainer::NAME);
  
         cimClass = container.getClass();         cimClass = container.getClass();
     }     }
     catch(Exception &)  
     {  
         // Do nothing. Container is missing, which implies normalization is disabled  
         // for this operation.  
     }  
  
     AutoPtr<NormalizerContext> tmpContext(new CIMOMHandleContext());     AutoPtr<NormalizerContext> tmpContext(new CIMOMHandleContext());
     ObjectNormalizer tmpNormalizer(     ObjectNormalizer tmpNormalizer(
Line 401 
Line 397 
     // operation.     // operation.
     CIMClass cimClass;     CIMClass cimClass;
  
     try      if(request->operationContext.contains(CachedClassDefinitionContainer::NAME))
     {     {
         CachedClassDefinitionContainer container =         CachedClassDefinitionContainer container =
             request->operationContext.get(CachedClassDefinitionContainer::NAME);              request->operationContext.get(
                   CachedClassDefinitionContainer::NAME);
         cimClass = container.getClass();         cimClass = container.getClass();
     }     }
     catch(Exception &)  
     {  
         // Do nothing. Container is missing, which implies normalization is disabled  
         // for this operation.  
     }  
  
     AutoPtr<NormalizerContext> tmpContext(new CIMOMHandleContext());     AutoPtr<NormalizerContext> tmpContext(new CIMOMHandleContext());
     ObjectNormalizer tmpNormalizer(     ObjectNormalizer tmpNormalizer(
Line 472 
Line 463 
     // operation.     // operation.
     CIMClass cimClass;     CIMClass cimClass;
  
     try      if(request->operationContext.contains(CachedClassDefinitionContainer::NAME))
     {     {
         CachedClassDefinitionContainer container =         CachedClassDefinitionContainer container =
             request->operationContext.get(CachedClassDefinitionContainer::NAME);              request->operationContext.get(
                   CachedClassDefinitionContainer::NAME);
  
         cimClass = container.getClass();         cimClass = container.getClass();
     }     }
     catch(Exception &)  
     {  
         // Do nothing. Container is missing, which implies normalization is disabled  
         // for this operation.  
     }  
  
     AutoPtr<NormalizerContext> tmpContext(new CIMOMHandleContext());     AutoPtr<NormalizerContext> tmpContext(new CIMOMHandleContext());
     ObjectNormalizer tmpNormalizer(     ObjectNormalizer tmpNormalizer(
Line 1008 
Line 995 
     //  Get list of subscription instance names from context     //  Get list of subscription instance names from context
     Array<CIMObjectPath> subscriptionInstanceNames;     Array<CIMObjectPath> subscriptionInstanceNames;
  
     try      if(context.contains(SubscriptionInstanceNamesContainer::NAME))
     {     {
         SubscriptionInstanceNamesContainer container =         SubscriptionInstanceNamesContainer container =
             context.get(SubscriptionInstanceNamesContainer::NAME);             context.get(SubscriptionInstanceNamesContainer::NAME);
  
         subscriptionInstanceNames = container.getInstanceNames();         subscriptionInstanceNames = container.getInstanceNames();
     }     }
     catch(Exception &)      else
     {     {
         subscriptionInstanceNames.clear();         subscriptionInstanceNames.clear();
     }     }
Line 1023 
Line 1010 
     // l10n     // l10n
     ContentLanguageList contentLangs;     ContentLanguageList contentLangs;
  
     try      if(context.contains(ContentLanguageListContainer::NAME))
     {     {
         // Get the Content-Language for this indication.  The provider         // Get the Content-Language for this indication.  The provider
         // does not have to add specify a language for the indication.         // does not have to add specify a language for the indication.
Line 1032 
Line 1019 
  
         contentLangs = langContainer.getLanguages();         contentLangs = langContainer.getLanguages();
     }     }
     catch(Exception &)      else
     {     {
         // The provider did not explicitly set a Content-Language for         // The provider did not explicitly set a Content-Language for
         // the indication.  Fall back to the lang set in this object.         // the indication.  Fall back to the lang set in this object.
Line 1053 
Line 1040 
  
     request->operationContext = context;     request->operationContext = context;
  
     try      if(request->operationContext.contains(ContentLanguageListContainer::NAME))
     {     {
         request->operationContext.set(ContentLanguageListContainer(contentLangs));         request->operationContext.set(ContentLanguageListContainer(contentLangs));
     }     }
     catch(Exception &)      else
     {     {
         request->operationContext.insert(ContentLanguageListContainer(contentLangs));         request->operationContext.insert(ContentLanguageListContainer(contentLangs));
     }     }

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