From 5d8c72322733c734085b80c3f1a11186da58769f Mon Sep 17 00:00:00 2001
From: Matej Sekoranja <unknown>
Date: Tue, 12 Aug 2014 13:08:18 +0200
Subject: [PATCH] fixed size arrays and ChannelArray

---
 src/server/responseHandlers.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/server/responseHandlers.cpp b/src/server/responseHandlers.cpp
index 4baf98c..5c0b52e 100644
--- a/src/server/responseHandlers.cpp
+++ b/src/server/responseHandlers.cpp
@@ -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;