(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.34.4.2

version 1.34, 2006/11/30 04:29:37 version 1.34.4.2, 2007/10/29 06:59:52
Line 35 
Line 35 
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
   //NOCHKSRC
   
 #include "CMPI_Version.h" #include "CMPI_Version.h"
  
 #include "CMPI_Broker.h" #include "CMPI_Broker.h"
Line 55 
Line 57 
 PEGASUS_USING_STD; PEGASUS_USING_STD;
 PEGASUS_NAMESPACE_BEGIN PEGASUS_NAMESPACE_BEGIN
  
   static const CMPIUint32 MB_CAPABILITIES =
   #   ifdef CMPI_VER_200
       CMPI_MB_Supports_Extended_Error |
   #   endif
       CMPI_MB_BasicRead | CMPI_MB_BasicWrite | CMPI_MB_InstanceManipulation |
       CMPI_MB_AssociationTraversal | CMPI_MB_QueryNormalization |
       CMPI_MB_Indications | CMPI_MB_BasicQualifierSupport |
       CMPI_MB_OSEncapsulationSupport
   #   ifndef PEGASUS_DISABLE_EXECQUERY
       | CMPI_MB_QueryExecution
   #   endif
       ;
   
 #define DDD(X)   if (_cmpi_trace) X; #define DDD(X)   if (_cmpi_trace) X;
  
 extern int _cmpi_trace; extern int _cmpi_trace;
Line 230 
Line 245 
          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 =           return  reinterpret_cast<CMPIEnumeration*> (new CMPI_Object(
              new CMPI_Object(new CMPI_ObjEnumeration(new Array<CIMObject>(en)));              new CMPI_ObjEnumeration(new Array<CIMObject>(en))));
          return (CMPI_ObjEnumeration *)obj->getHdl();  
  
       }       }
       catch (const CIMException &e) {       catch (const CIMException &e) {
Line 278 
Line 292 
              (*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) {
Line 318 
Line 327 
             (*aObj)[index].setNameSpace(CM_ObjectPath(cop)->getNameSpace());             (*aObj)[index].setNameSpace(CM_ObjectPath(cop)->getNameSpace());
           }           }
  
           CMPI_Object *obj = new CMPI_Object(new CMPI_OpEnumeration(aObj));            return  reinterpret_cast<CMPIEnumeration*>
                (new CMPI_Object(new CMPI_OpEnumeration(aObj)));
          return (CMPI_OpEnumeration *)obj->getHdl();  
  
       }       }
       catch (const CIMException &e) {       catch (const CIMException &e) {
Line 371 
Line 379 
              (*aInst)[index].setPath(orgCop);              (*aInst)[index].setPath(orgCop);
          }          }
  
          CMPI_Object *obj = new CMPI_Object(new CMPI_ObjEnumeration(aInst));           return  reinterpret_cast<CMPIEnumeration*>
               (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) {
Line 421 
Line 424 
          {          {
              (*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: mbAssociatorsNames - code: "<<e.getCode()<<" msg: "<<e.getMessage()<<endl);          DDD(cout<<"### exception: mbAssociatorsNames - code: "<<e.getCode()<<" msg: "<<e.getMessage()<<endl);
Line 471 
Line 472 
              (*aInst)[index].setPath(orgCop);              (*aInst)[index].setPath(orgCop);
          }          }
  
          CMPI_Object *obj = new CMPI_Object(new CMPI_ObjEnumeration(aInst));           return  reinterpret_cast<CMPIEnumeration*>
               (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 511 
          {          {
              (*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);
Line 706 
Line 700 
 } }
  
 static CMPIBrokerFT broker_FT={ static CMPIBrokerFT broker_FT={
      0, // brokerClassification;       MB_CAPABILITIES, // brokerClassification;
      CMPICurrentVersion,      CMPICurrentVersion,
      "Pegasus",      "Pegasus",
      mbPrepareAttachThread,      mbPrepareAttachThread,

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