From df128defc8b919bfcaaae8d8d84e642902b1111c Mon Sep 17 00:00:00 2001
From: Xavier Elattaoui <xavier.elattaoui@synchrotron-soleil.fr>
Date: Tue, 9 Feb 2016 09:34:58 +0000
Subject: [PATCH] minor change

---
 pom.xml                    |  2 +-
 src/MCCE2Electrometers.cpp | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 631206b..7cf1a2e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
   </parent>
   <groupId>fr.soleil.device</groupId>
   <artifactId>MCCE2Electrometers-${aol}-${mode}</artifactId>
-  <version>2.2.7-SNAPSHOT</version>
+  <version>2.2.7</version>
   <packaging>nar</packaging>
   <name>MCCE2Electrometers</name>
 <!-- use for the name of executable -->
diff --git a/src/MCCE2Electrometers.cpp b/src/MCCE2Electrometers.cpp
index 2dd17cf..9b9be09 100644
--- a/src/MCCE2Electrometers.cpp
+++ b/src/MCCE2Electrometers.cpp
@@ -2596,7 +2596,6 @@ void MCCE2Electrometers::set_polarity(Tango::DevString argin)
   }
 }
 
-
 //+------------------------------------------------------------------
 /**
  *  method: MCCE2Electrometers::get_electrometer_type_str
@@ -2630,17 +2629,24 @@ Tango::DevString MCCE2Electrometers::get_electrometer_type_str(Tango::DevUShort
     );
   }
 
-  if ( *attr_electrometerChannel_read == ELETRO_CHANNEL_ONE )
+  if ( argin == ELETRO_CHANNEL_ONE )
   {
     argout = new char[this->_electroCH1StrType.size()+1];
     ::strncpy(argout, _electroCH1StrType.c_str(), _electroCH1StrType.size());
   }
-
-  if ( *attr_electrometerChannel_read == ELETRO_CHANNEL_TWO )
+  else if ( argin == ELETRO_CHANNEL_TWO )
   {
     argout = new char[this->_electroCH2StrType.size()+1];
     ::strncpy(argout, _electroCH2StrType.c_str(), _electroCH2StrType.size());
   }
+  else
+  {
+    Tango::Except::throw_exception(
+      "INVALID_PARAMETER",
+      "Channel number must be 1 or 2.",
+      "MCCE2Electrometers::get_electrometer_type_str()"
+    );
+  }
 
   return argout;
 }
-- 
GitLab