Skip to content
This repository was archived by the owner on Jul 8, 2022. It is now read-only.

Fix SF793 for Tango 9 LTS #320

Merged
merged 1 commit into from
Nov 30, 2016
Merged

Fix SF793 for Tango 9 LTS #320

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 42 additions & 30 deletions cppapi/client/proxy_asyn.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
static const char *RcsId = "$Id$\n$Name$";
static const char *RcsId = "$Id: proxy_asyn.cpp 30242 2016-10-27 11:48:23Z bourtemb $\n$Name$";
//====================================================================================
//
// cpp - C++ source code file for TANGO api Connection and DeviceProxy
Expand Down Expand Up @@ -29,7 +29,7 @@ static const char *RcsId = "$Id$\n$Name$";
// along with Tango. If not, see <http://www.gnu.org/licenses/>.
//
//
// $Revision$
// $Revision: 30242 $
//
//===================================================================================

Expand Down Expand Up @@ -576,13 +576,16 @@ DeviceData Connection::command_inout_reply(long id,long call_timeout)

if (i == nb)
{
TangoSys_OMemStream desc;
desc << "Device " << dev_name();
desc << ": Reply for asynchronous call (id = " << id;
desc << ") is not yet arrived" << ends;
ApiAsynNotThereExcept::throw_exception(API_AsynReplyNotArrived,
desc.str(),
"Connection::command_inout_reply");
if (req.request->poll_response() == false)
{
TangoSys_OMemStream desc;
desc << "Device " << dev_name();
desc << ": Reply for asynchronous call (id = " << id;
desc << ") is not yet arrived" << ends;
ApiAsynNotThereExcept::throw_exception(API_AsynReplyNotArrived,
desc.str(),
"Connection::command_inout_reply");
}
}
}

Expand Down Expand Up @@ -1407,13 +1410,16 @@ vector<DeviceAttribute> *DeviceProxy::read_attributes_reply(long id,long call_ti

if (i == nb)
{
TangoSys_OMemStream desc;
desc << "Device " << device_name;
desc << ": Reply for asynchronous call (id = " << id;
desc << ") is not yet arrived" << ends;
ApiAsynNotThereExcept::throw_exception(API_AsynReplyNotArrived,
desc.str(),
"DeviceProxy::read_attributes_reply");
if (req.request->poll_response() == false)
{
TangoSys_OMemStream desc;
desc << "Device " << device_name;
desc << ": Reply for asynchronous call (id = " << id;
desc << ") is not yet arrived" << ends;
ApiAsynNotThereExcept::throw_exception(API_AsynReplyNotArrived,
desc.str(),
"DeviceProxy::read_attributes_reply");
}
}
}

Expand Down Expand Up @@ -1650,13 +1656,16 @@ DeviceAttribute *DeviceProxy::read_attribute_reply(long id,long call_timeout)

if (i == nb)
{
TangoSys_OMemStream desc;
desc << "Device " << device_name;
desc << ": Reply for asynchronous call (id = " << id;
desc << ") is not yet arrived" << ends;
ApiAsynNotThereExcept::throw_exception(API_AsynReplyNotArrived,
desc.str(),
"DeviceProxy::read_attribute_reply");
if (req.request->poll_response() == false)
{
TangoSys_OMemStream desc;
desc << "Device " << device_name;
desc << ": Reply for asynchronous call (id = " << id;
desc << ") is not yet arrived" << ends;
ApiAsynNotThereExcept::throw_exception(API_AsynReplyNotArrived,
desc.str(),
"DeviceProxy::read_attribute_reply");
}
}
}

Expand Down Expand Up @@ -2265,13 +2274,16 @@ void DeviceProxy::write_attributes_reply(long id,long call_timeout)

if (i == nb)
{
TangoSys_OMemStream desc;
desc << "Device " << device_name;
desc << ": Reply for asynchronous call (id = " << id;
desc << ") is not yet arrived" << ends;
ApiAsynNotThereExcept::throw_exception(API_AsynReplyNotArrived,
desc.str(),
"DeviceProxy::write_attributes_reply");
if (req.request->poll_response() == false)
{
TangoSys_OMemStream desc;
desc << "Device " << device_name;
desc << ": Reply for asynchronous call (id = " << id;
desc << ") is not yet arrived" << ends;
ApiAsynNotThereExcept::throw_exception(API_AsynReplyNotArrived,
desc.str(),
"DeviceProxy::write_attributes_reply");
}
}
}

Expand Down