epics/pvData
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

capacity fix

Browse Source
This commit is contained in:
Matej Sekoranja
2011-02-09 23:06:20 +01:00
parent 62b285e79d
commit 355f43fb97
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pvDataApp/factory/PVDataCreateFactory.cpp
View File

@@ -354,7 +354,7 @@ void DefaultPVArray<T>::deserialize(ByteBuffer *pbuffer, \
DeserializableControl *pcontrol) { \
int size = SerializeHelper::readSize(pbuffer, pcontrol); \
if(size>=0) { \
if(size>PVArray::getCapacity()) PVArray::setCapacity(size); \
if(size>getCapacity()) setCapacity(size); \
int i = 0; \
while(true) { \
int maxIndex = std::min(size-i, pbuffer->getRemaining())+i; \
@@ -373,7 +373,7 @@ void DefaultPVArray<T>::deserialize(ByteBuffer *pbuffer, \
template<> \
void DefaultPVArray<T>::serialize(ByteBuffer *pbuffer, \
SerializableControl *pflusher, int offset, int count) { \
int length = PVArray::getLength(); \
int length = getLength(); \
\
if(offset<0) \
offset = 0; \

5
testApp/misc/testSerialization.cpp
View File

@@ -337,12 +337,13 @@ void testArray() {
" ",
"test",
"smile",
"this is a little longer string... maybe a little but longer... this makes test better" };
"this is a little longer string... maybe a little but longer... this makes test better",
String(10000, 'b') };
PVStringArray* pvString = (PVStringArray*)factory->createPVScalarArray(
NULL, "pvStringArray", epics::pvData::pvString);
pvString->put(0, 0, stringEmpty, 0);
serializationTest(pvString);
pvString->put(0, 7, strv, 0);
pvString->put(0, 8, strv, 0);
serializationTest(pvString);
delete pvString;