(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.36 and 1.37

version 1.36, 2007/05/28 05:31:04 version 1.37, 2007/06/25 11:54:34
Line 140 
Line 140 
          CM_ClassOrigin(flgs),          CM_ClassOrigin(flgs),
          props);          props);
          ci.setPath(*CM_ObjectPath(cop));          ci.setPath(*CM_ObjectPath(cop));
          if (rc) CMSetStatus(rc,CMPI_RC_OK);           CMSetStatus(rc,CMPI_RC_OK);
          return reinterpret_cast<CMPIInstance*>(new CMPI_Object(new CIMInstance(ci)));          return reinterpret_cast<CMPIInstance*>(new CMPI_Object(new CIMInstance(ci)));
       }       }
       catch (const CIMException &e) {       catch (const CIMException &e) {
Line 163 
Line 163 
                      OperationContext(*CM_Context(ctx)),                      OperationContext(*CM_Context(ctx)),
          CM_ObjectPath(cop)->getNameSpace(),          CM_ObjectPath(cop)->getNameSpace(),
                      *CM_Instance(ci));                      *CM_Instance(ci));
          if (rc) CMSetStatus(rc,CMPI_RC_OK);           CMSetStatus(rc,CMPI_RC_OK);
          return reinterpret_cast<CMPIObjectPath*>(new CMPI_Object(new CIMObjectPath(ncop)));          return reinterpret_cast<CMPIObjectPath*>(new CMPI_Object(new CIMObjectPath(ncop)));
       }       }
       catch (const CIMException &e) {       catch (const CIMException &e) {
Line 238 
Line 238 
          CM_ObjectPath(cop)->getNameSpace(),          CM_ObjectPath(cop)->getNameSpace(),
          String(query),          String(query),
          String(lang));          String(lang));
          if (rc) CMSetStatus(rc,CMPI_RC_OK);           CMSetStatus(rc,CMPI_RC_OK);
  
          return  reinterpret_cast<CMPIEnumeration*> (new CMPI_Object(          return  reinterpret_cast<CMPIEnumeration*> (new CMPI_Object(
             new CMPI_ObjEnumeration(new Array<CIMObject>(en))));             new CMPI_ObjEnumeration(new Array<CIMObject>(en))));
Line 271 
Line 271 
          CM_IncludeQualifiers(flgs),          CM_IncludeQualifiers(flgs),
          CM_ClassOrigin(flgs),          CM_ClassOrigin(flgs),
          props);          props);
          if (rc) CMSetStatus(rc,CMPI_RC_OK);           CMSetStatus(rc,CMPI_RC_OK);
  
          // Workaround for bugzilla 4677          // Workaround for bugzilla 4677
          // When running out of process the returned instances don't contain          // When running out of process the returned instances don't contain
Line 309 
Line 309 
                      OperationContext(*CM_Context(ctx)),                      OperationContext(*CM_Context(ctx)),
          CM_ObjectPath(cop)->getNameSpace(),          CM_ObjectPath(cop)->getNameSpace(),
          CM_ObjectPath(cop)->getClassName());          CM_ObjectPath(cop)->getClassName());
          if (rc) CMSetStatus(rc,CMPI_RC_OK);           CMSetStatus(rc,CMPI_RC_OK);
  
           // When running out of process the returned instances don't contain           // When running out of process the returned instances don't contain
           // a name space. Create a writable copy of the array and add the           // a name space. Create a writable copy of the array and add the
Line 355 
Line 355 
          CM_IncludeQualifiers(flgs),          CM_IncludeQualifiers(flgs),
          CM_ClassOrigin(flgs),          CM_ClassOrigin(flgs),
          props);          props);
          if (rc) CMSetStatus(rc,CMPI_RC_OK);           CMSetStatus(rc,CMPI_RC_OK);
  
          // Workaround for bugzilla 4677          // Workaround for bugzilla 4677
          // When running out of process the returned instances don't contain          // When running out of process the returned instances don't contain
Line 403 
Line 403 
          resultClass ? CIMName(resultClass) : CIMName(),          resultClass ? CIMName(resultClass) : CIMName(),
          role ? String(role) : String::EMPTY,          role ? String(role) : String::EMPTY,
          resultRole ? String(resultRole) : String::EMPTY);          resultRole ? String(resultRole) : String::EMPTY);
          if (rc) CMSetStatus(rc,CMPI_RC_OK);           CMSetStatus(rc,CMPI_RC_OK);
  
          // When running out of process the returned instances don't contain          // When running out of process the returned instances don't contain
          // a name space. Create a writable copy of the array and add the          // a name space. Create a writable copy of the array and add the
Line 448 
Line 448 
          CM_IncludeQualifiers(flgs),          CM_IncludeQualifiers(flgs),
          CM_ClassOrigin(flgs),          CM_ClassOrigin(flgs),
          props);          props);
          if (rc) CMSetStatus(rc,CMPI_RC_OK);           CMSetStatus(rc,CMPI_RC_OK);
          // Workaround for bugzilla 4677          // Workaround for bugzilla 4677
          // When running out of process the returned instances don't contain          // When running out of process the returned instances don't contain
          // a name space. Create a writable copy of the array and add the          // a name space. Create a writable copy of the array and add the
Line 490 
Line 490 
          qop,          qop,
          resultClass ? CIMName(resultClass) : CIMName(),          resultClass ? CIMName(resultClass) : CIMName(),
          role ? String(role) : String::EMPTY);          role ? String(role) : String::EMPTY);
          if (rc) CMSetStatus(rc,CMPI_RC_OK);           CMSetStatus(rc,CMPI_RC_OK);
  
          // When running out of process the returned instances don't contain          // When running out of process the returned instances don't contain
          // a name space. Create a writable copy of the array and add the          // a name space. Create a writable copy of the array and add the
Line 598 
Line 598 
          CIMType vType=v.getType();          CIMType vType=v.getType();
          CMPIType t=type2CMPIType(vType,v.isArray());          CMPIType t=type2CMPIType(vType,v.isArray());
          value2CMPIData(v,t,&data);          value2CMPIData(v,t,&data);
          if (rc) CMSetStatus(rc,CMPI_RC_OK);           CMSetStatus(rc,CMPI_RC_OK);
       }       }
       catch (const CIMException &e) {       catch (const CIMException &e) {
          DDD(cout<<"### exception: mbGetProperty - code: "<<e.getCode()<<" msg: "<<e.getMessage()<<endl);          DDD(cout<<"### exception: mbGetProperty - code: "<<e.getCode()<<" msg: "<<e.getMessage()<<endl);
          if (rc) CMSetStatus(rc,(CMPIrc)e.getCode());           CMSetStatus(rc,(CMPIrc)e.getCode());
       }       }
       return data; // "data" will be valid data or nullValue (in error case)       return data; // "data" will be valid data or nullValue (in error case)
    }    }

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