Update of /cvsroot/sblim/cmpi-devel
In directory vz-cvs-3.sog:/tmp/cvs-serv3925
Modified Files:
CmpiImpl.cpp NEWS
Log Message:
Fixed 3531597: returnData with char type fails
Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/cmpi-devel/NEWS,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- NEWS 3 Jun 2012 05:35:38 -0000 1.22
+++ NEWS 5 Jun 2012 22:36:12 -0000 1.23
@@ -4,6 +4,7 @@
Bugs Fixed:
- 3531598 several CmpiObjectPath methods leak memory
- 3531599 replace CMGetCharPtr with CMGetCharsPtr
+- 3531597 returnData with char type fails
New Features:
- 3531601 add CmpiString constructor for char data
Index: CmpiImpl.cpp
===================================================================
RCS file: /cvsroot/sblim/cmpi-devel/CmpiImpl.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- CmpiImpl.cpp 3 Jun 2012 05:35:38 -0000 1.14
+++ CmpiImpl.cpp 5 Jun 2012 22:36:11 -0000 1.15
@@ -1353,7 +1353,8 @@
}
void CmpiResult::returnData(const CmpiData& d) {
- CMPIStatus rc=getEnc()->ft->returnData(getEnc(),&d._data.value,d._data.type);
+ CMPIStatus rc=getEnc()->ft->returnData(getEnc(),
+ (d._data.type!=CMPI_chars) ? &d._data.value : (CMPIValue *)d._data.value.chars, d._data.type);
if (rc.rc!=CMPI_RC_OK) throw CmpiStatus(rc);
}
|
