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

fixed testChannelAccess

Browse Source
This commit is contained in:
Matej Sekoranja
2015-12-16 13:52:56 +01:00
parent 22d6db2818
commit 91b5cc707d
4 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
testApp/remote/testServer.cpp
View File

@@ -2649,37 +2649,28 @@ public:
short /*priority*/,
std::string const & address)
{
if (address == "local")
// this is a server instance provider, address holds remote socket IP
if (channelName == "testCounter")
{
if (channelName == "testCounter")
{
channelRequester->channelCreated(Status::Ok, m_counterChannel);
return m_counterChannel;
}
else if (channelName == "testADC")
{
channelRequester->channelCreated(Status::Ok, m_adcChannel);
return m_adcChannel;
}
else if (channelName == "testMP")
{
channelRequester->channelCreated(Status::Ok, m_mpChannel);
return m_mpChannel;
}
else
{
ChannelProvider::shared_pointer chProviderPtr = shared_from_this();
Channel::shared_pointer channel = MockChannel::create(chProviderPtr, channelRequester, channelName, address);
channelRequester->channelCreated(Status::Ok, channel);
return channel;
}
channelRequester->channelCreated(Status::Ok, m_counterChannel);
return m_counterChannel;
}
else if (channelName == "testADC")
{
channelRequester->channelCreated(Status::Ok, m_adcChannel);
return m_adcChannel;
}
else if (channelName == "testMP")
{
channelRequester->channelCreated(Status::Ok, m_mpChannel);
return m_mpChannel;
}
else
{
Channel::shared_pointer nullPtr;
Status errorStatus(Status::STATUSTYPE_ERROR, "only local supported");
channelRequester->channelCreated(errorStatus, nullPtr);
return nullPtr;
ChannelProvider::shared_pointer chProviderPtr = shared_from_this();
Channel::shared_pointer channel = MockChannel::create(chProviderPtr, channelRequester, channelName, address);
channelRequester->channelCreated(Status::Ok, channel);
return channel;
}
}
private: