(file) Return to CQLSelectStatementRep.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / CQL

Diff for /pegasus/src/Pegasus/CQL/CQLSelectStatementRep.cpp between version 1.26 and 1.27

version 1.26, 2008/08/28 17:24:33 version 1.27, 2008/10/01 04:46:15
Line 442 
Line 442 
     CIMValue nodeVal = nodeProp.getValue();     CIMValue nodeVal = nodeProp.getValue();
     CIMType nodeValType = nodeVal.getType();     CIMType nodeValType = nodeVal.getType();
     if (nodeValType != CIMTYPE_OBJECT     if (nodeValType != CIMTYPE_OBJECT
 #ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT          && nodeValType != CIMTYPE_INSTANCE )
     && nodeValType != CIMTYPE_INSTANCE  
 #endif // PEGASUS_EMBEDDED_INSTANCE_SUPPORT  
         )  
     {     {
         PEG_TRACE_CSTRING (TRC_CQL, Tracer::LEVEL1,"not emb");         PEG_TRACE_CSTRING (TRC_CQL, Tracer::LEVEL1,"not emb");
         PEG_METHOD_EXIT();         PEG_METHOD_EXIT();
Line 490 
Line 487 
  
     CIMObject nodeObj;  // this starts uninitialized     CIMObject nodeObj;  // this starts uninitialized
     CIMInstance nodeInst;     CIMInstance nodeInst;
 #ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT  
     if(nodeValType == CIMTYPE_OBJECT)     if(nodeValType == CIMTYPE_OBJECT)
     {     {
 #endif // PEGASUS_EMBEDDED_INSTANCE_SUPPORT  
     nodeVal.get(nodeObj);     nodeVal.get(nodeObj);
     if (nodeObj.isUninitialized())     if (nodeObj.isUninitialized())
     {     {
Line 517 
Line 512 
         throw CQLRuntimeException(parms);         throw CQLRuntimeException(parms);
     }     }
     nodeInst = CIMInstance(nodeObj);     nodeInst = CIMInstance(nodeObj);
 #ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT  
     }     }
  
     else if(nodeValType == CIMTYPE_INSTANCE)     else if(nodeValType == CIMTYPE_INSTANCE)
Line 535 
Line 529 
             throw CQLRuntimeException(parms);             throw CQLRuntimeException(parms);
         }         }
     }     }
 #endif // PEGASUS_EMBEDDED_INSTANCE_SUPPORT  
     //     //
     // Do the projection.     // Do the projection.
     //     //
Line 628 
Line 621 
                  allowMissing);                  allowMissing);
  
     // Put the projected instance back into the property.     // Put the projected instance back into the property.
 #ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT  
     if(nodeValType == CIMTYPE_INSTANCE)     if(nodeValType == CIMTYPE_INSTANCE)
     {     {
         nodeProp.setValue(nodeInst);         nodeProp.setValue(nodeInst);
     }     }
     else     else
 #endif  
     {     {
         CIMObject newNodeObj(nodeInst);         CIMObject newNodeObj(nodeInst);
         CIMValue newNodeVal(newNodeObj);         CIMValue newNodeVal(newNodeObj);


Legend:
Removed from v.1.26  
changed lines
  Added in v.1.27

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2