Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-13 00:31:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct mistake in channel validation

Browse Source
This commit is contained in:
Alexey Rybalchenko 2015-06-19 14:40:56 +02:00
parent 252acf41c8
commit 5f20a28b04
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fairmq/FairMQChannel.cxx
View File

@ -154,7 +154,7 @@ bool FairMQChannel::ValidateChannel()
return false; return false;
} }
if (fAddress == "unspecified" && fAddress == "") if (fAddress == "unspecified" || fAddress == "")
{ {
ss << "INVALID"; ss << "INVALID";
LOG(DEBUG) << ss.str(); LOG(DEBUG) << ss.str();

7
fairmq/FairMQDevice.cxx
View File

@ -259,10 +259,13 @@ void FairMQDevice::RunWrapper()
Run(); Run();
try { try
{
rateLogger.interrupt(); rateLogger.interrupt();
rateLogger.join(); rateLogger.join();
} catch(boost::thread_resource_error& e) { }
catch(boost::thread_resource_error& e)
{
LOG(ERROR) << e.what(); LOG(ERROR) << e.what();
} }