diff --git a/pvDataApp/factory/PVDataCreateFactory.cpp b/pvDataApp/factory/PVDataCreateFactory.cpp index 59e1683..1bb1d3e 100644 --- a/pvDataApp/factory/PVDataCreateFactory.cpp +++ b/pvDataApp/factory/PVDataCreateFactory.cpp @@ -354,7 +354,7 @@ void DefaultPVArray::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::deserialize(ByteBuffer *pbuffer, \ template<> \ void DefaultPVArray::serialize(ByteBuffer *pbuffer, \ SerializableControl *pflusher, int offset, int count) { \ - int length = PVArray::getLength(); \ + int length = getLength(); \ \ if(offset<0) \ offset = 0; \ diff --git a/testApp/misc/testSerialization.cpp b/testApp/misc/testSerialization.cpp index a6e2df4..c582afa 100644 --- a/testApp/misc/testSerialization.cpp +++ b/testApp/misc/testSerialization.cpp @@ -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;