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

Diff for /pegasus/src/Pegasus/ProviderManager2/CMPI/CMPI_Broker.cpp between version 1.34 and 1.35

version 1.34, 2006/11/30 04:29:37 version 1.35, 2007/04/12 17:53:22
Line 230 
Line 230 
          String(query),          String(query),
          String(lang));          String(lang));
          if (rc) CMSetStatus(rc,CMPI_RC_OK);          if (rc) CMSetStatus(rc,CMPI_RC_OK);
          CMPI_Object *obj =  
              new CMPI_Object(new CMPI_ObjEnumeration(new Array<CIMObject>(en)));  
          return (CMPI_ObjEnumeration *)obj->getHdl();  
  
            return  reinterpret_cast<CMPIEnumeration*> (new CMPI_Object(
               new CMPI_ObjEnumeration(new Array<CIMObject>(en))));
       }       }
       catch (const CIMException &e) {       catch (const CIMException &e) {
          DDD(cout<<"### exception: mbExecQuery - code: "<<e.getCode()<<" msg: "<<e.getMessage()<<endl);          DDD(cout<<"### exception: mbExecQuery - code: "<<e.getCode()<<" msg: "<<e.getMessage()<<endl);
Line 278 
Line 277 
              (*aInst)[index].setPath(orgCop);              (*aInst)[index].setPath(orgCop);
          }          }
  
          CMPI_Object *obj = new CMPI_Object(new CMPI_InstEnumeration(aInst));           return  reinterpret_cast<CMPIEnumeration*>
                (new CMPI_Object(new CMPI_InstEnumeration(aInst)));
          /*CMPI_Object *obj =  
              new CMPI_Object(new CMPI_InstEnumeration(new Array<CIMInstance>(en)));*/  
          // End of workaround for bugzilla 4677  
   
          return (CMPI_InstEnumeration*)obj->getHdl();  
   
       }       }
       catch (const CIMException &e) {       catch (const CIMException &e) {
          DDD(cout<<"### exception: mbEnumInstances - code: "<<e.getCode()<<" msg: "<<e.getMessage()<<endl);          DDD(cout<<"### exception: mbEnumInstances - code: "<<e.getCode()<<" msg: "<<e.getMessage()<<endl);
Line 317 
Line 310 
           {           {
             (*aObj)[index].setNameSpace(CM_ObjectPath(cop)->getNameSpace());             (*aObj)[index].setNameSpace(CM_ObjectPath(cop)->getNameSpace());
           }           }
             return  reinterpret_cast<CMPIEnumeration*>
           CMPI_Object *obj = new CMPI_Object(new CMPI_OpEnumeration(aObj));               (new CMPI_Object(new CMPI_OpEnumeration(aObj)));
   
          return (CMPI_OpEnumeration *)obj->getHdl();  
   
       }       }
       catch (const CIMException &e) {       catch (const CIMException &e) {
          DDD(cout<<"### exception: mbEnumInstances - code: "<<e.getCode()<<" msg: "<<e.getMessage()<<endl);          DDD(cout<<"### exception: mbEnumInstances - code: "<<e.getCode()<<" msg: "<<e.getMessage()<<endl);
Line 370 
Line 360 
              orgCop.setNameSpace(CM_ObjectPath(cop)->getNameSpace());              orgCop.setNameSpace(CM_ObjectPath(cop)->getNameSpace());
              (*aInst)[index].setPath(orgCop);              (*aInst)[index].setPath(orgCop);
          }          }
            return  reinterpret_cast<CMPIEnumeration*>
          CMPI_Object *obj = new CMPI_Object(new CMPI_ObjEnumeration(aInst));               (new CMPI_Object(new CMPI_ObjEnumeration(aInst)));
   
          /*CMPI_Object *obj =  
                 new CMPI_Object(new CMPI_ObjEnumeration(new Array<CIMObject>(en)));*/  
          // End of workaround for bugzilla 4677  
   
          return (CMPI_ObjEnumeration *)obj->getHdl();  
   
       }       }
       catch (const CIMException &e) {       catch (const CIMException &e) {
          DDD(cout<<"### exception: mbAssociators - code: "<<e.getCode()<<" msg: "<<e.getMessage()<<endl);          DDD(cout<<"### exception: mbAssociators - code: "<<e.getCode()<<" msg: "<<e.getMessage()<<endl);
Line 421 
Line 404 
          {          {
              (*aObj)[index].setNameSpace(CM_ObjectPath(cop)->getNameSpace());              (*aObj)[index].setNameSpace(CM_ObjectPath(cop)->getNameSpace());
          }          }
            return  reinterpret_cast<CMPIEnumeration*>
               (new CMPI_Object(new CMPI_OpEnumeration(aObj)));
  
          CMPI_Object *obj = new CMPI_Object(new CMPI_OpEnumeration(aObj));  
   
          return (CMPI_OpEnumeration *)obj->getHdl();  
       }       }
       catch (const CIMException &e) {       catch (const CIMException &e) {
          DDD(cout<<"### exception: mbAssociatorsNames - code: "<<e.getCode()<<" msg: "<<e.getMessage()<<endl);          DDD(cout<<"### exception: mbAssociatorsNames - code: "<<e.getCode()<<" msg: "<<e.getMessage()<<endl);
Line 470 
Line 452 
              orgCop.setNameSpace(CM_ObjectPath(cop)->getNameSpace());              orgCop.setNameSpace(CM_ObjectPath(cop)->getNameSpace());
              (*aInst)[index].setPath(orgCop);              (*aInst)[index].setPath(orgCop);
          }          }
             return  reinterpret_cast<CMPIEnumeration*>
          CMPI_Object *obj = new CMPI_Object(new CMPI_ObjEnumeration(aInst));               (new CMPI_Object(new CMPI_ObjEnumeration(aInst)));
   
          /*CMPI_Object *obj =  
                 new CMPI_Object(new CMPI_ObjEnumeration(new Array<CIMObject>(en)));*/  
          // End of workaround for bugzilla 4677  
   
          return (CMPI_ObjEnumeration *)obj->getHdl();  
       }       }
       catch (const CIMException &e) {       catch (const CIMException &e) {
          DDD(cout<<"### exception: mbReferences - code: "<<e.getCode()<<" msg: "<<e.getMessage()<<endl);          DDD(cout<<"### exception: mbReferences - code: "<<e.getCode()<<" msg: "<<e.getMessage()<<endl);
Line 515 
Line 491 
          {          {
              (*aObj)[index].setNameSpace(CM_ObjectPath(cop)->getNameSpace());              (*aObj)[index].setNameSpace(CM_ObjectPath(cop)->getNameSpace());
          }          }
            return  reinterpret_cast<CMPIEnumeration*>
          CMPI_Object *obj = new CMPI_Object(new CMPI_OpEnumeration(aObj));              (new CMPI_Object(new CMPI_OpEnumeration(aObj)));
   
          return (CMPI_OpEnumeration *)obj->getHdl();  
       }       }
       catch (const CIMException &e) {       catch (const CIMException &e) {
          DDD(cout<<"### exception: mbReferencesNames - code: "<<e.getCode()<<" msg: "<<e.getMessage()<<endl);          DDD(cout<<"### exception: mbReferencesNames - code: "<<e.getCode()<<" msg: "<<e.getMessage()<<endl);

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