fixed size arrays and ChannelArray

2014-08-12 13:08:18 +02:00
parent b51b0798bc
commit 5d8c723227
1 changed files with 9 additions and 1 deletions
@@ -1889,7 +1889,15 @@ void ServerChannelArrayRequesterImpl::activate(PVStructure::shared_pointer const

 void ServerChannelArrayRequesterImpl::channelArrayConnect(const Status& status, ChannelArray::shared_pointer const & channelArray, Array::const_shared_pointer const & array)
 {
-	{
+    if (status.isSuccess() && array->getArraySizeType() == Array::fixed)
+    {
+        Lock guard(_mutex);
+        _status = Status(Status::STATUSTYPE_ERROR, "fixed sized array returned as a ChannelArray array instance");
+        _channelArray.reset();
+        _array.reset();
+    }
+    else
+    {
 		Lock guard(_mutex);
 		_status = status;
 		_channelArray = channelArray;