Correct mistake in channel validation

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

View File

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

View File

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