(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.3 and 1.35.4.1

version 1.33.2.3, 2009/10/13 13:39:27 version 1.35.4.1, 2012/02/15 17:47:16
Line 36 
Line 36 
 #include <Pegasus/Common/SharedPtr.h> #include <Pegasus/Common/SharedPtr.h>
 #include <Pegasus/Provider/CIMOMHandle.h> #include <Pegasus/Provider/CIMOMHandle.h>
 #include <Pegasus/Config/ConfigManager.h> #include <Pegasus/Config/ConfigManager.h>
   #include <Pegasus/Common/SCMOClassCache.h>
  
 PEGASUS_NAMESPACE_BEGIN PEGASUS_NAMESPACE_BEGIN
  
Line 636 
Line 637 
         CIMCreateInstanceResponseMessage& msg =         CIMCreateInstanceResponseMessage& msg =
             *static_cast<CIMCreateInstanceResponseMessage*>(getResponse());             *static_cast<CIMCreateInstanceResponseMessage*>(getResponse());
  
         msg.instanceName = getObjects()[0];          Array<CIMObjectPath> cimObjs= getObjects();
           Array<SCMOInstance> scmoObjs= getSCMOObjects();
           if (cimObjs.size() != 0)
           {
               msg.instanceName = cimObjs[0];
           }
           else
           {
               scmoObjs[0].getCIMObjectPath(msg.instanceName);
           }
     }     }
 } }
  
Line 797 
Line 807 
     Array<SCMOInstance> scmoObjs= getSCMOObjects();     Array<SCMOInstance> scmoObjs= getSCMOObjects();
     if (cimObjs.size() != 0)     if (cimObjs.size() != 0)
     {     {
           // complete keybindings based on set property values
           CIMOperationRequestMessage * reqMsg =
               (CIMOperationRequestMessage*) _request;
   
           Boolean clsRead=false;
           for (Uint32 j = 0, m = cimObjs.size(); j < m; j++)
           {
               CIMObject & co=cimObjs[j];
               CIMObjectPath op=co.getPath();
               const Array<CIMKeyBinding>& kbs=op.getKeyBindings();
               if (kbs.size()==0)
               {     // no path set why ?
                   if (clsRead==false || _cimClass.isUninitialized())
                   {
                       SCMOClassCache * classCache = SCMOClassCache::getInstance();
                       CString nsName = reqMsg->nameSpace.getString().getCString();
                       CString clName = reqMsg->className.getString().getCString();
                       SCMOClass theClass = classCache->getSCMOClass(
                           nsName,
                           strlen(nsName),
                           clName,
                           strlen(clName));
                       theClass.getCIMClass(_cimClass);
                       clsRead=true;
                   }
                   op = CIMInstance(co).buildPath(_cimClass);
               }
               op.setNameSpace(reqMsg->nameSpace);
               op.setHost(System::getHostName());
               co.setPath(op);
           }
         msg.getResponseData().setObjects(cimObjs);         msg.getResponseData().setObjects(cimObjs);
     }     }
     if (scmoObjs.size() != 0)     if (scmoObjs.size() != 0)
Line 836 
Line 877 
     SimpleObjectResponseHandler::deliver(cimObject);     SimpleObjectResponseHandler::deliver(cimObject);
 } }
  
   void AssociatorsResponseHandler::deliver(const CIMInstance& cimInstance)
   {
       if (cimInstance.isUninitialized())
       {
           MessageLoaderParms message(
               "Common.Exception.UNINITIALIZED_OBJECT_EXCEPTION",
               "The object is not initialized.");
   
           throw CIMException(CIM_ERR_FAILED, message);
       }
   
       SimpleObjectResponseHandler::deliver(cimInstance);
   }
   
 void AssociatorsResponseHandler::deliver(const SCMOInstance& scmoObject) void AssociatorsResponseHandler::deliver(const SCMOInstance& scmoObject)
 { {
     if (scmoObject.isUninitialized())     if (scmoObject.isUninitialized())
Line 1175 
Line 1230 
         contentLangs = getLanguages();         contentLangs = getLanguages();
     }     }
  
       Uint32 timeoutMilliSec = 0;
       if (context.contains(TimeoutContainer::NAME))
       {
           TimeoutContainer timeoutContainer =
               context.get(TimeoutContainer::NAME);
           timeoutMilliSec = timeoutContainer.getTimeOut();
       }
   
     // create message     // create message
     CIMProcessIndicationRequestMessage* request =     CIMProcessIndicationRequestMessage* request =
         new CIMProcessIndicationRequestMessage(         new CIMProcessIndicationRequestMessage(
Line 1183 
Line 1246 
         cimInstance,         cimInstance,
         subscriptionInstanceNames,         subscriptionInstanceNames,
         _provider,         _provider,
         QueueIdStack());  // Must be filled in by the callback function          QueueIdStack(),  // Must be filled in by the callback function
           timeoutMilliSec);
  
     request->operationContext = context;     request->operationContext = context;
  

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