From 5f20a28b04b87a1db5e7aadafe7be32ebd1d7c3d Mon Sep 17 00:00:00 2001
From: Alexey Rybalchenko <alexryba@gmail.com>
Date: Fri, 19 Jun 2015 14:40:56 +0200
Subject: [PATCH] Correct mistake in channel validation

---
 fairmq/FairMQChannel.cxx | 2 +-
 fairmq/FairMQDevice.cxx  | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/fairmq/FairMQChannel.cxx b/fairmq/FairMQChannel.cxx
index 6e56cb94..6562b4ec 100644
--- a/fairmq/FairMQChannel.cxx
+++ b/fairmq/FairMQChannel.cxx
@@ -154,7 +154,7 @@ bool FairMQChannel::ValidateChannel()
         return false;
     }
 
-    if (fAddress == "unspecified" && fAddress == "")
+    if (fAddress == "unspecified" || fAddress == "")
     {
         ss << "INVALID";
         LOG(DEBUG) << ss.str();
diff --git a/fairmq/FairMQDevice.cxx b/fairmq/FairMQDevice.cxx
index e131c529..efb5ec86 100644
--- a/fairmq/FairMQDevice.cxx
+++ b/fairmq/FairMQDevice.cxx
@@ -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();
     }