(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.33.2.2 and 1.33.2.3

version 1.33.2.2, 2009/10/01 09:33:41 version 1.33.2.3, 2009/10/13 13:39:27
Line 318 
Line 318 
         _normalizer);         _normalizer);
 } }
  
 void GetInstanceResponseHandler::deliver(const SCMOInstance& cimInstance)  void GetInstanceResponseHandler::deliver(const CIMInstance& cimInstance)
 { {
     if (cimInstance.isUninitialized())     if (cimInstance.isUninitialized())
     {     {
Line 338 
Line 338 
         throw CIMException(CIM_ERR_FAILED, message);         throw CIMException(CIM_ERR_FAILED, message);
     }     }
  
     SCMOInstance localInstance(cimInstance);      CIMInstance localInstance(cimInstance);
 #ifdef PEGASUS_ENABLE_OBJECT_NORMALIZATION #ifdef PEGASUS_ENABLE_OBJECT_NORMALIZATION
     // The normalizer expects an object path embedded in instances even     // The normalizer expects an object path embedded in instances even
     // though it is not required by this operation. Use the requested     // though it is not required by this operation. Use the requested
Line 350 
Line 350 
             getRequest())->instanceName);             getRequest())->instanceName);
     }     }
 #endif #endif
     SimpleInstanceResponseHandler::deliver(localInstance);      SimpleInstanceResponseHandler::deliver(
     // TBD          _normalizer.processInstance(localInstance));
     //_normalizer.processInstance(localInstance));  
 } }
  
 void GetInstanceResponseHandler::deliver(const CIMInstance& cimInstance)  void GetInstanceResponseHandler::deliver(const SCMOInstance& cimInstance)
 { {
     if (cimInstance.isUninitialized())     if (cimInstance.isUninitialized())
     {     {
Line 375 
Line 374 
         throw CIMException(CIM_ERR_FAILED, message);         throw CIMException(CIM_ERR_FAILED, message);
     }     }
  
     CIMInstance localInstance(cimInstance);      SimpleInstanceResponseHandler::deliver(cimInstance);
 #ifdef PEGASUS_ENABLE_OBJECT_NORMALIZATION  
     // The normalizer expects an object path embedded in instances even  
     // though it is not required by this operation. Use the requested  
     // object path is missing from the instance.  
     if (localInstance.getPath().getKeyBindings().size() == 0)  
     {  
         // ATTN: should clone before modification  
         localInstance.setPath(static_cast<CIMGetInstanceRequestMessage*>(  
             getRequest())->instanceName);  
     }  
 #endif  
     SimpleInstanceResponseHandler::deliver(  
         _normalizer.processInstance(localInstance));  
 } }
  
 void GetInstanceResponseHandler::complete() void GetInstanceResponseHandler::complete()
Line 417 
Line 403 
     {     {
         CIMGetInstanceResponseMessage& msg =         CIMGetInstanceResponseMessage& msg =
             *static_cast<CIMGetInstanceResponseMessage*>(getResponse());             *static_cast<CIMGetInstanceResponseMessage*>(getResponse());
           Array<CIMInstance> cimObjs= getObjects();
         msg.getResponseData().setSCMOInstance(getSCMOObjects()[0]);          Array<SCMOInstance> scmoObjs= getSCMOObjects();
         // TODO --RK--> enable for C++ Providers again          if (cimObjs.size() != 0)
         // msg.getResponseData().setCimInstance(getObjects()[0]);          {
               msg.getResponseData().setInstance(cimObjs[0]);
           }
           else
           {
               msg.getResponseData().setSCMO(scmoObjs);
           }
     }     }
 } }
  
Line 466 
Line 458 
         _normalizer.processInstance(cimInstance));         _normalizer.processInstance(cimInstance));
 } }
  
 void EnumerateInstancesResponseHandler::deliver(const SCMOInstance& cimInstance)  void EnumerateInstancesResponseHandler::deliver(
       const SCMOInstance& scmoInstance)
 { {
     if (cimInstance.isUninitialized())      if (scmoInstance.isUninitialized())
     {     {
         MessageLoaderParms message(         MessageLoaderParms message(
             "Common.Exception.UNINITIALIZED_OBJECT_EXCEPTION",             "Common.Exception.UNINITIALIZED_OBJECT_EXCEPTION",
Line 476 
Line 469 
  
         throw CIMException(CIM_ERR_FAILED, message);         throw CIMException(CIM_ERR_FAILED, message);
     }     }
       SimpleInstanceResponseHandler::deliver(scmoInstance);
     SimpleInstanceResponseHandler::deliver(cimInstance);  
     // TBD  
     //    _normalizer.processInstance(cimInstance));  
 } }
  
 String EnumerateInstancesResponseHandler::getClass() const String EnumerateInstancesResponseHandler::getClass() const
Line 492 
Line 482 
     CIMEnumerateInstancesResponseMessage& msg =     CIMEnumerateInstancesResponseMessage& msg =
         *static_cast<CIMEnumerateInstancesResponseMessage*>(getResponse());         *static_cast<CIMEnumerateInstancesResponseMessage*>(getResponse());
  
     // TBD --RK--> enable for C++ Providers again      Array<CIMInstance> cimObjs= getObjects();
     msg.getResponseData().setSCMOInstances(getSCMOObjects());      Array<SCMOInstance> scmoObjs= getSCMOObjects();
       if (cimObjs.size() != 0)
       {
           msg.getResponseData().setInstances(cimObjs);
       }
       if (scmoObjs.size() != 0)
       {
           msg.getResponseData().setSCMO(scmoObjs);
       }
 } }
  
 // //
Line 542 
Line 540 
     }     }
  
     SimpleObjectPathResponseHandler::deliver(scmoObjectPath);     SimpleObjectPathResponseHandler::deliver(scmoObjectPath);
     // TBD  
     //        _normalizer.processInstanceObjectPath(cimObjectPath));  
 } }
  
 String EnumerateInstanceNamesResponseHandler::getClass() const String EnumerateInstanceNamesResponseHandler::getClass() const
Line 556 
Line 552 
     CIMEnumerateInstanceNamesResponseMessage& msg =     CIMEnumerateInstanceNamesResponseMessage& msg =
         *static_cast<CIMEnumerateInstanceNamesResponseMessage*>(getResponse());         *static_cast<CIMEnumerateInstanceNamesResponseMessage*>(getResponse());
  
     // TODO --RK--> enable for C++ Providers again      Array<CIMObjectPath> cimObjs= getObjects();
     msg.getResponseData().setSCMOInstanceNames(getSCMOObjects());      Array<SCMOInstance> scmoObjs= getSCMOObjects();
       if (cimObjs.size() != 0)
       {
           msg.getResponseData().setInstanceNames(cimObjs);
       }
       if (scmoObjs.size() != 0)
       {
           msg.getResponseData().setSCMO(scmoObjs);
       }
 } }
  
 // //
Line 595 
Line 599 
     SimpleObjectPathResponseHandler::deliver(cimObjectPath);     SimpleObjectPathResponseHandler::deliver(cimObjectPath);
 } }
  
 void CreateInstanceResponseHandler::deliver(const SCMOInstance& cimObjectPath)  
 {  
     if (cimObjectPath.getClassName() == 0)  
     {  
         MessageLoaderParms message(  
             "Common.Exception.UNINITIALIZED_OBJECT_EXCEPTION",  
             "The object is not initialized.");  
   
         throw CIMException(CIM_ERR_FAILED, message);  
     }  
   
     if (SimpleObjectPathResponseHandler::size() != 0)  
     {  
         MessageLoaderParms message(  
             "Server.OperationResponseHandler.TOO_MANY_OBJECTS_DELIVERED",  
             "Too many objects delivered.");  
   
         throw CIMException(CIM_ERR_FAILED, message);  
     }  
   
     SimpleObjectPathResponseHandler::deliver(cimObjectPath);  
 }  
   
 void CreateInstanceResponseHandler::complete() void CreateInstanceResponseHandler::complete()
 { {
     if (SimpleObjectPathResponseHandler::size() == 0)     if (SimpleObjectPathResponseHandler::size() == 0)
Line 788 
Line 769 
     SimpleInstance2ObjectResponseHandler::deliver(cimInstance);     SimpleInstance2ObjectResponseHandler::deliver(cimInstance);
 } }
  
 void ExecQueryResponseHandler::deliver(const SCMOInstance& cimInstance)  void ExecQueryResponseHandler::deliver(const SCMOInstance& scmoInstance)
 { {
     if (cimInstance.isUninitialized())      if (scmoInstance.isUninitialized())
     {     {
         MessageLoaderParms message(         MessageLoaderParms message(
             "Common.Exception.UNINITIALIZED_OBJECT_EXCEPTION",             "Common.Exception.UNINITIALIZED_OBJECT_EXCEPTION",
Line 799 
Line 780 
         throw CIMException(CIM_ERR_FAILED, message);         throw CIMException(CIM_ERR_FAILED, message);
     }     }
  
     SimpleInstance2ObjectResponseHandler::deliver(cimInstance);      SimpleInstance2ObjectResponseHandler::deliver(scmoInstance);
 } }
  
 String ExecQueryResponseHandler::getClass() const String ExecQueryResponseHandler::getClass() const
Line 812 
Line 793 
     CIMExecQueryResponseMessage& msg =     CIMExecQueryResponseMessage& msg =
         *static_cast<CIMExecQueryResponseMessage*>(getResponse());         *static_cast<CIMExecQueryResponseMessage*>(getResponse());
  
     msg.getResponseData().setCIMObjects(getObjects());      Array<CIMObject> cimObjs= getObjects();
       Array<SCMOInstance> scmoObjs= getSCMOObjects();
       if (cimObjs.size() != 0)
       {
           msg.getResponseData().setObjects(cimObjs);
       }
       if (scmoObjs.size() != 0)
       {
           msg.getResponseData().setSCMO(scmoObjs);
       }
 } }
  
 Boolean ExecQueryResponseHandler::isAsync() const Boolean ExecQueryResponseHandler::isAsync() const
Line 846 
Line 836 
     SimpleObjectResponseHandler::deliver(cimObject);     SimpleObjectResponseHandler::deliver(cimObject);
 } }
  
 void AssociatorsResponseHandler::deliver(const SCMOInstance& cimObject)  void AssociatorsResponseHandler::deliver(const SCMOInstance& scmoObject)
 { {
     if (cimObject.isUninitialized())      if (scmoObject.isUninitialized())
     {     {
         MessageLoaderParms message(         MessageLoaderParms message(
             "Common.Exception.UNINITIALIZED_OBJECT_EXCEPTION",             "Common.Exception.UNINITIALIZED_OBJECT_EXCEPTION",
Line 856 
Line 846 
  
         throw CIMException(CIM_ERR_FAILED, message);         throw CIMException(CIM_ERR_FAILED, message);
     }     }
       SimpleObjectResponseHandler::deliver(scmoObject);
     SimpleObjectResponseHandler::deliver(cimObject);  
 } }
  
 String AssociatorsResponseHandler::getClass() const String AssociatorsResponseHandler::getClass() const
Line 870 
Line 859 
     CIMAssociatorsResponseMessage& msg =     CIMAssociatorsResponseMessage& msg =
         *static_cast<CIMAssociatorsResponseMessage*>(getResponse());         *static_cast<CIMAssociatorsResponseMessage*>(getResponse());
  
     // TODO --RK--> enable for C++ Providers again      Array<CIMObject> cimObjs= getObjects();
     msg.getResponseData().setCIMObjects(getObjects());      Array<SCMOInstance> scmoObjs= getSCMOObjects();
       if (cimObjs.size() != 0)
       {
           msg.getResponseData().setObjects(cimObjs);
       }
       if (scmoObjs.size() != 0)
       {
           msg.getResponseData().setSCMO(scmoObjs);
       }
 } }
  
 // //
Line 900 
Line 897 
     SimpleObjectPathResponseHandler::deliver(cimObjectPath);     SimpleObjectPathResponseHandler::deliver(cimObjectPath);
 } }
  
 void AssociatorNamesResponseHandler::deliver(const SCMOInstance& cimObjectPath)  void AssociatorNamesResponseHandler::deliver(const SCMOInstance& scmoObjectPath)
 {  
     if (cimObjectPath.getClassName() == 0)  
     {     {
         MessageLoaderParms message(      SimpleObjectPathResponseHandler::deliver(scmoObjectPath);
             "Common.Exception.UNINITIALIZED_OBJECT_EXCEPTION",  
             "The object is not initialized.");  
   
         throw CIMException(CIM_ERR_FAILED, message);  
     }  
   
     SimpleObjectPathResponseHandler::deliver(cimObjectPath);  
 } }
  
 String AssociatorNamesResponseHandler::getClass() const String AssociatorNamesResponseHandler::getClass() const
Line 924 
Line 912 
     CIMAssociatorNamesResponseMessage& msg =     CIMAssociatorNamesResponseMessage& msg =
         *static_cast<CIMAssociatorNamesResponseMessage*>(getResponse());         *static_cast<CIMAssociatorNamesResponseMessage*>(getResponse());
  
     msg.objectNames = getObjects();      Array<CIMObjectPath> cimObjs= getObjects();
       Array<SCMOInstance> scmoObjs= getSCMOObjects();
       if (cimObjs.size() != 0)
       {
           msg.getResponseData().setInstanceNames(cimObjs);
       }
       if (scmoObjs.size() != 0)
       {
           msg.getResponseData().setSCMO(scmoObjs);
       }
 } }
  
 // //
Line 953 
Line 950 
     SimpleObjectResponseHandler::deliver(cimObject);     SimpleObjectResponseHandler::deliver(cimObject);
 } }
  
 void ReferencesResponseHandler::deliver(const SCMOInstance& cimObject)  void ReferencesResponseHandler::deliver(const SCMOInstance& scmoObject)
 { {
     if (cimObject.isUninitialized())      if (scmoObject.isUninitialized())
     {     {
         MessageLoaderParms message(         MessageLoaderParms message(
             "Common.Exception.UNINITIALIZED_OBJECT_EXCEPTION",             "Common.Exception.UNINITIALIZED_OBJECT_EXCEPTION",
Line 963 
Line 960 
  
         throw CIMException(CIM_ERR_FAILED, message);         throw CIMException(CIM_ERR_FAILED, message);
     }     }
       SimpleObjectResponseHandler::deliver(scmoObject);
     SimpleObjectResponseHandler::deliver(cimObject);  
 } }
  
 String ReferencesResponseHandler::getClass() const String ReferencesResponseHandler::getClass() const
Line 977 
Line 973 
     CIMReferencesResponseMessage& msg =     CIMReferencesResponseMessage& msg =
         *static_cast<CIMReferencesResponseMessage*>(getResponse());         *static_cast<CIMReferencesResponseMessage*>(getResponse());
  
     msg.cimObjects = getObjects();      Array<CIMObject> cimObjs= getObjects();
       Array<SCMOInstance> scmoObjs= getSCMOObjects();
       if (cimObjs.size() != 0)
       {
           msg.getResponseData().setObjects(cimObjs);
       }
       if (scmoObjs.size() != 0)
       {
           msg.getResponseData().setSCMO(scmoObjs);
       }
 } }
  
 // //
Line 1006 
Line 1011 
     SimpleObjectPathResponseHandler::deliver(cimObjectPath);     SimpleObjectPathResponseHandler::deliver(cimObjectPath);
 } }
  
 void ReferenceNamesResponseHandler::deliver(const SCMOInstance& cimObjectPath)  void ReferenceNamesResponseHandler::deliver(const SCMOInstance& scmoObjectPath)
 {  
     if (cimObjectPath.getClassName() == 0)  
     {     {
         MessageLoaderParms message(      SimpleObjectPathResponseHandler::deliver(scmoObjectPath);
             "Common.Exception.UNINITIALIZED_OBJECT_EXCEPTION",  
             "The object is not initialized.");  
   
         throw CIMException(CIM_ERR_FAILED, message);  
     }  
   
     SimpleObjectPathResponseHandler::deliver(cimObjectPath);  
 } }
  
 String ReferenceNamesResponseHandler::getClass() const String ReferenceNamesResponseHandler::getClass() const
Line 1030 
Line 1026 
     CIMReferenceNamesResponseMessage& msg =     CIMReferenceNamesResponseMessage& msg =
         *static_cast<CIMReferenceNamesResponseMessage*>(getResponse());         *static_cast<CIMReferenceNamesResponseMessage*>(getResponse());
  
     msg.objectNames = getObjects();      Array<CIMObjectPath> cimObjs= getObjects();
       Array<SCMOInstance> scmoObjs= getSCMOObjects();
       if (cimObjs.size() != 0)
       {
           msg.getResponseData().setInstanceNames(cimObjs);
       }
       if (scmoObjs.size() != 0)
       {
           msg.getResponseData().setSCMO(scmoObjs);
       }
 } }
  
 // //

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